From 7b63de2dc6aae6bf1052adb4992bddb3704d1a0d Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Wed, 17 Apr 2024 00:02:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=8A=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java | 1 + .../jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java | 3 +++ .../cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java | 3 +++ .../src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) 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 bf1b5a6b..583c3144 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 @@ -1509,6 +1509,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ocrTaskchildPictureApproVo.setProjectName(one.getFromprojectname());//项目名称 ocrTaskchildPictureApproVo.setCustomerLevel(one.getFromCustomerLevel());//客户级别 ocrTaskchildPictureApproVo.setReleaseArea(one.getFromCity());//拜访城市 + ocrTaskchildPictureApproVo.setTaskIndex(one.getTaskIndex()==null?"1":one.getTaskIndex()); 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 926380db..6b2b0f0b 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 @@ -199,4 +199,7 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "是否重复") private Integer isRepeat; + @ApiModelProperty(value = "当前节点") + private String taskIndex; + } 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 7d2af00e..37f2a206 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 @@ -83,4 +83,7 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable { @ApiModelProperty(value ="任务包主键") private String packageid; + @ApiModelProperty(value = "当前节点") + private String taskIndex; + } 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 b4743d56..02418533 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 @@ -627,6 +627,7 @@ uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, + uf.TASKINDEX, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, @@ -646,7 +647,7 @@ ) UNION - select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules + select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.TASKINDEX,uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op where tc.ID = uf.FORMID and tc.PICTUREID = op.ID