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 6912acde..257228f7 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 @@ -1481,6 +1481,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ocrTaskchildPictureApproVo.setFromUserName(one.getFromUserName()); //提报人 ocrTaskchildPictureApproVo.setManufacturer(one.getPicture().getField5()); //manufacturer ocrTaskchildPictureApproVo.setPackageid(one.getPackageid()); //任务包id + ocrTaskchildPictureApproVo.setProjectName(one.getFromprojectname());//项目名称 + ocrTaskchildPictureApproVo.setCustomerLevel(one.getFromCustomerLevel());//客户级别 + ocrTaskchildPictureApproVo.setReleaseArea(one.getFromCity());//拜访城市 + listNew.add(ocrTaskchildPictureApproVo); } 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 14f879d9..e642345c 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 @@ -133,6 +133,17 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "所属项目") private String fromprojectid; + @ApiModelProperty(value = "所属项目名称") + private String fromprojectname; + + @ApiModelProperty(value = "拜访客户级别") + private String fromCustomerLevel; + + @ApiModelProperty(value = "拜访城市") + private String fromCity; + + + @ApiModelProperty(value = "所属计划") private String fromplanid; diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index f2e289fa..e35b417b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -560,7 +560,9 @@ uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKINDEX, - uf.TASKNO + uf.TASKNO, + op.field6 as fromCustomerLevel, + op.releaseArea as fromCity from ocr_taskchild_picture tc LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID left join ocr_picture op on tc.PICTUREID = op.ID and op.suspiciousfile = 0 @@ -573,7 +575,9 @@ uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKINDEX, - uf.TASKNO + uf.TASKNO, + op.field6 as fromCustomerLevel, + op.releaseArea as fromCity from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op