From 5bf2df4df48c8f67e060d37735485dac7f3ec71e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 10 Feb 2025 18:05:56 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E5=92=8C=E5=88=9B=E5=BB=BA=E5=AD=90=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=B1=82=E9=80=BB=E8=BE=91=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B0service=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1353384555151360]工单转交和创建子任务接口层逻辑移动到service层 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1353384555151360
---
 .../dao/mapper/process/ProcessMapper.xml      | 20 +++++++++++--------
 .../service/ProcessTaskServiceImpl.java       |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml
index 9065aad85..76d804b02 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml
@@ -99,7 +99,7 @@
 		<result column="type" property="type" />
 		<result column="name" property="name" />
 		<result column="handler" property="handler" />
-		<result column="stepConfig" property="config" />
+		<result column="stepConfig" property="config" typeHandler="neatlogic.framework.dao.plugin.CompressHandler" />
 		<!--<collection property="formAttributeList" ofType="neatlogic.framework.process.dto.ProcessStepFormAttributeVo">
 			<result column="formAttributeUuid" property="attributeUuid" />
 			<result column="formUuid" property="formUuid" />
@@ -155,7 +155,7 @@
 		<result column="name" property="name" />
 		<result column="isActive" property="isActive" />
 		<result column="formUuid" property="formUuid" />
-		<result column="configStr" property="configStr" />
+		<result column="configStr" property="configStr" typeHandler="neatlogic.framework.dao.plugin.CompressHandler"/>
 	</resultMap>
 
 	<select id="getProcessByUuid" parameterType="java.lang.String" resultMap="processDetailMap">
@@ -240,7 +240,11 @@
 	</select>
 
 	<select id="checkProcessNameIsRepeat" resultType="int">
-		SELECT count(1) FROM `process` WHERE name=#{name} AND uuid != #{uuid}
+		SELECT count(1) FROM `process`
+		WHERE name=#{name}
+		  <if test="uuid != null and uuid != ''">
+		  AND uuid != #{uuid}
+		  </if>
 	</select>
 
 	<sql id="searchProcessWhere">
@@ -489,7 +493,7 @@
 		#{uuid},
 		#{processUuid},
 		#{name},
-		#{config}
+		#{config, typeHandler=CompressHandler}
 		)
 	</insert>
 
@@ -515,7 +519,7 @@
 		#{uuid},
 		#{name},
 		#{isActive},
-		#{configStr},
+		#{configStr, typeHandler=CompressHandler},
 		now(3),
 		#{fcu},
 		now(3),
@@ -540,7 +544,7 @@
 		#{name},
 		#{type},
 		#{handler},
-		#{config},
+		#{config, typeHandler=CompressHandler},
 		#{description}
 		)
 	</insert>
@@ -619,7 +623,7 @@
 		#{uuid},
 		#{processUuid},
 		#{name},
-		#{configStr},
+		#{configStr, typeHandler=CompressHandler},
 		now(3),
 		#{fcu},
 		#{md5}
@@ -657,7 +661,7 @@
 			`is_active` = #{isActive},
 		</if>
 		<if test="configStr != null and configStr != ''">
-			`config` = #{configStr},
+			`config` = #{configStr, typeHandler=CompressHandler},
 		</if>
 		`lcu` = #{lcu},
 		`lcd` = NOW(3)
diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
index 68b5122b7..a558fb02b 100644
--- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
@@ -2892,6 +2892,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC
         workerArray.addAll(workerList);
         processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.WORKERLIST.getParamName(), workerArray);
         processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CONTENT.getParamName(), content);
+        processTaskStepVo.getParamObj().put("source", source);
         handler.transfer(processTaskStepVo, processTaskStepWorkerList);
         if (Objects.equals(isSaveData, 1)) {
             ProcessTaskStepDataVo processTaskStepDataVo = new ProcessTaskStepDataVo();
-- 
Gitee