From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
index 9dfc088..665b558 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml
@@ -17,7 +17,7 @@
</sql>
<resultMap type="com.ycl.entity.caseHandler.WorkflowConfigStep" id="RecordResultMap" extends="BaseResultMap">
<collection property="disposeRecords" javaType="ArrayList" ofType="com.ycl.entity.caseHandler.DisposeRecord">
- <id column="id" property="id" />
+ <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" />
@@ -28,17 +28,20 @@
<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="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
+ 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}
- AND udr.base_case_id = #{baseCaseId}
</select>
</mapper>
--
Gitblit v1.8.0