From afbc1b29cd2ce92484f1be1e533ee075dbe08ff2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 10 十月 2022 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml | 7 +++----
1 files changed, 3 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..bfe75cc 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" />
@@ -33,12 +33,11 @@
<select id="selectRecordByWorkflowConfigStepId" parameterType="map" resultMap="RecordResultMap">
SELECT
- *
+ uwcs.*,udr.*,udr.id record_id
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}
WHERE
uwcs.workflow_config_id = #{workflowConfigId}
- AND udr.base_case_id = #{baseCaseId}
</select>
</mapper>
--
Gitblit v1.8.0