From c4aa721a61edb5ff4502d621897c266b98ef3d1c Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 24 二月 2023 11:18:58 +0800
Subject: [PATCH] 按报警点位统计,按区域统计

---
 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