From 0612c6fc1f2395e1d398bb906e5d23fec2f76aee Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 30 三月 2023 19:49:44 +0800
Subject: [PATCH] 上传

---
 ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
index 9cc2038..665b558 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
@@ -16,12 +16,32 @@
         id, workflow_config_id "workflowConfigId", name "name",role_id "roleId",seq "seq"
     </sql>
     <resultMap type="com.ycl.entity.caseHandler.WorkflowConfigStep" id="RecordResultMap" extends="BaseResultMap">
-        <association property="disposeRecord" column="id"
-                     select="com.ycl.mapper.caseHandler.DisposeRecordMapper.selectByWorkflowConfigStepId"
-                     javaType="com.ycl.entity.caseHandler.DisposeRecord" />
+        <collection property="disposeRecords" javaType="ArrayList" ofType="com.ycl.entity.caseHandler.DisposeRecord">
+            <id column="record_id" property="id" />
+            <result column="base_case_id" property="baseCaseId" />
+            <result column="workflow_config_step_id" property="workflowConfigStepId" />
+            <result column="step_name" property="stepName" />
+            <result column="start_time" property="startTime" />
+            <result column="handler_role_id" property="handlerRoleId" />
+            <result column="end_time" property="endTime" />
+            <result column="state" property="state" />
+            <result column="handler_id" property="handlerId" />
+            <result column="create_user" property="createUser" />
+            <result column="create_time" property="createTime" />
+            <result column="handler_text" property="handlerText" />
+            <result column="result" property="result" />
+            <result column="limit_time" property="limitTime" />
+        </collection>
     </resultMap>
-    <select id="selectRecordByWorkflowConfigStepId" parameterType="Integer" resultMap="RecordResultMap">
-        SELECT * FROM ums_workflow_config_step uwcs
-                 WHERE uwcs.workflow_config_id=#{id}
+
+    <select id="selectRecordByWorkflowConfigStepId" parameterType="map" resultMap="RecordResultMap">
+        SELECT
+            uwcs.*,udr.*,udr.id record_id,ua.nick_name handler_text
+        FROM
+            ums_workflow_config_step uwcs
+                LEFT JOIN ums_dispose_record udr ON uwcs.id = udr.workflow_config_step_id AND udr.base_case_id = #{baseCaseId}
+                LEFT JOIN ums_admin ua ON udr.handler_id = ua.id
+        WHERE
+            uwcs.workflow_config_id = #{workflowConfigId}
     </select>
 </mapper>

--
Gitblit v1.8.0