diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index b1eb836c..a947fa03 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -36,6 +36,7 @@ import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; import cn.jyjz.xiaoyao.ocr.dataobject.*; import cn.jyjz.xiaoyao.ocr.service.*; import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting; +import cn.jyjz.xiaoyao.ocr.vo.OcrTaskchildPictureApproVo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -1335,13 +1336,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask for (OcrTaskchildPictureAppro taskchildPicture : list) { - if (taskchildPicture.getPictureid() != null && !taskchildPicture.getPictureid().isEmpty()) { Long pictureId = Long.parseLong(taskchildPicture.getPictureid()); LambdaQueryWrapper ocrPictureLambdaQueryWrapper = new LambdaQueryWrapper<>(); ocrPictureLambdaQueryWrapper.eq(OcrPicture::getId, pictureId); OcrPicture ocrPictureOne = ocrPictureService.getOne(ocrPictureLambdaQueryWrapper); taskchildPicture.setFromUserName(ocrPictureOne.getField1()); + taskchildPicture.setPicture(ocrPictureOne); } //查询对应的流程分类 @@ -1463,7 +1464,29 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ocrTaskchildPictureAppro.setStatshisText("待审批"); } } - pageUtils.setList(list); + + List listNew = new ArrayList<>(); + for(OcrTaskchildPictureAppro one : list){ + OcrTaskchildPictureApproVo ocrTaskchildPictureApproVo = new OcrTaskchildPictureApproVo(); + ocrTaskchildPictureApproVo.setId(one.getId()); + ocrTaskchildPictureApproVo.setFromtaskname(one.getFromtaskname()); + ocrTaskchildPictureApproVo.setStatshisText(one.getStatshisText()); + ocrTaskchildPictureApproVo.setTasknamehis(one.getTasknamehis()); + ocrTaskchildPictureApproVo.setFinishTime(one.getTransferRecords().get(0).getFinishTime()); + ocrTaskchildPictureApproVo.setReleaseProvince(one.getPicture().getField10()); + ocrTaskchildPictureApproVo.setFromprojectid(one.getFromprojectid()); + ocrTaskchildPictureApproVo.setProductName(one.getPicture().getField9()); + ocrTaskchildPictureApproVo.setCategory(one.getCategory()); + ocrTaskchildPictureApproVo.setFromsourceid(one.getFromsourceid()); + ocrTaskchildPictureApproVo.setCustomerType(one.getPicture().getField2()); + ocrTaskchildPictureApproVo.setCustomerName(one.getPicture().getField3()); + ocrTaskchildPictureApproVo.setItemCategory(one.getPicture().getField17()); + ocrTaskchildPictureApproVo.setFromUserName(one.getFromUserName()); + ocrTaskchildPictureApproVo.setManufacturer(one.getPicture().getField5()); + listNew.add(ocrTaskchildPictureApproVo); + } + + pageUtils.setList(listNew); } /** diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java index d2f647ae..9fca97af 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java @@ -176,4 +176,7 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "审批记录") private List transferRecords; + @ApiModelProperty(value = "picture表数据") + private OcrPicture picture; + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java new file mode 100644 index 00000000..15d41737 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java @@ -0,0 +1,77 @@ +package cn.jyjz.xiaoyao.ocr.vo; + +import cn.jyjz.flowable.domain.dto.HistoricTaskInstanceDto; +import cn.jyjz.xiaoyao.oa.from.dataobject.Category; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="任务信息", description="任务信息") +public class OcrTaskchildPictureApproVo implements java.io.Serializable { + + private static final long serialVersionUID = -8018660053527763810L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "任务ID") + private String fromtaskname; + + @ApiModelProperty(value = "审批状态,记录当前节点审批状态,1:.待审批 (只针对前端返回 库中逻辑上不存在) 2.通过 3.不通过") + private String statshisText; + + @ApiModelProperty(value = "审批节点名称") + private String tasknamehis; + + @ApiModelProperty(value = "提交时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date finishTime; + + @ApiModelProperty(value = "拜访地区") + private String releaseProvince; + + @ApiModelProperty(value = "所属项目") + private String fromprojectid; + + @ApiModelProperty(value = "产品名称") + private String productName; + + @ApiModelProperty(value = "类型名称") + private String category; + + @ApiModelProperty(value = "任务来源") + private String fromsourceid; + + @ApiModelProperty(value = "客户类型") + private String customerType; + + @ApiModelProperty(value = "客户名称") + private String customerName; + + @ApiModelProperty(value = "项目类别") + private String itemCategory; + + @ApiModelProperty(value = "拜访城市") + private String releaseArea; + + @ApiModelProperty(value = "客户级别") + private String customerLevel; + + @ApiModelProperty(value = "提报人") + private String fromUserName; + + @ApiModelProperty(value = "厂商") + private String manufacturer; + +}