From 249d3d57a2f54779d8b2e8c6a953b00d914ab371 Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Tue, 30 Apr 2024 18:26:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E6=A3=80=E7=B4=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=80=E5=B1=9E=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowable/service/impl/FlowTaskServiceImpl.java  |  1 +
 .../xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java  |  3 +++
 .../mapper/oa/OcrTaskchildPictureMapper.xml         | 13 +++++++++++++
 3 files changed, 17 insertions(+)

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 9b78dd4a..ae4e4c0f 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 @@
                     </if>
                     ${izupuser.likeend}
                 </if>
+                <if test="izplan != null">
+                    ${izplan.rulesOp} tcp.FROMPLANID ${izplan.dataOp} ${izplan.likestar}
+                    <!--				#{fromuserid.value}-->
+                    <if test="izplan.value instanceof java.util.List">
+                        <foreach item="item" collection="izplan.value" open="" separator="," close="">
+                            #{item}
+                        </foreach>
+                    </if>
+                    <if test="!izplan.value instanceof java.util.List">
+                        #{izplan.value}
+                    </if>
+                    ${izplan.likeend}
+                </if>
                 <if test="iztaskrrom != null">
                     ${iztaskrrom.rulesOp} tcp.FROMSOURCEID ${iztaskrrom.dataOp} ${iztaskrrom.likestar}
                     <!--				#{fromuserid.value}-->