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 8e4abb0d..422cb95d 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 @@ -1628,6 +1628,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ocrTaskchildPictureApproVo.setProjectName(one.getFromprojectname());//项目名称 ocrTaskchildPictureApproVo.setCustomerLevel(one.getFromCustomerLevel());//客户级别 ocrTaskchildPictureApproVo.setReleaseArea(one.getFromCity());//拜访城市 + ocrTaskchildPictureApproVo.setFromplanid(one.getFromplanid());//所属计划 ocrTaskchildPictureApproVo.setTaskIndex(one.getTaskNodeIndex() == null ? one.getTasknode() : one.getTaskNodeIndex()); listNew.add(ocrTaskchildPictureApproVo); 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 index 1e1e95ad..270113fb 100644 --- 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 @@ -81,4 +81,7 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable { @ApiModelProperty(value = "当前节点") private String taskIndex; + @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 76638919..6660afcb 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 @@ -507,6 +507,19 @@ ${izupuser.likeend} + + ${izplan.rulesOp} tcp.FROMPLANID ${izplan.dataOp} ${izplan.likestar} + + + + #{item} + + + + #{izplan.value} + + ${izplan.likeend} + ${iztaskrrom.rulesOp} tcp.FROMSOURCEID ${iztaskrrom.dataOp} ${iztaskrrom.likestar}