From ecb8ee9c13ef1d4b7c0324dcd39e3ae34d9ce5b5 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 14 Sep 2024 23:21:05 +0800
Subject: [PATCH] 1、自行受理bug修复2 2、流程进度展示bug修复2

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 7862efc..7d34a14 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -82,7 +82,26 @@
             <result property="updateTime" column="update_time"/>
     </resultMap>
     <resultMap id="dataResult-all" type="cn.huge.module.cases.domain.dto.CasePageDTO">
-
+        <result property="id" column="id"/>
+        <result property="status" column="status"/>
+        <result property="statusName" column="status_name"/>
+        <result property="canal" column="canal"/>
+        <result property="canalName" column="canal_name"/>
+        <result property="caseLevel" column="case_level"/>
+        <result property="caseType" column="case_type"/>
+        <result property="caseTypeName" column="case_type_name"/>
+        <result property="inputUnitId" column="input_unit_id"/>
+        <result property="inputUnitName" column="input_unit_name"/>
+        <result property="mediResult" column="medi_result"/>
+        <result property="mediResultName" column="medi_result_name"/>
+        <result property="mediateUnitId" column="mediate_unit_id"/>
+        <result property="mediateUnitName" column="mediate_unit_name"/>
+        <result property="assistUnitId" column="assist_unit_id"/>
+        <result property="assistUnitName" column="assist_unit_name"/>
+        <result property="closeTime" column="close_time"/>
+        <result property="agreeType" column="agree_type"/>
+        <result property="agreeTypeName" column="agree_type_name"/>
+        <result property="agreeContent" column="agree_content"/>
     </resultMap>
     <!-- 表 -->
     <sql id='table-name'>dyh_case_info</sql>
@@ -97,9 +116,16 @@
         a.case_type_name,
         a.input_unit_id,
         a.input_unit_name,
+        b.medi_result,
         b.medi_result_name,
-        b.mediate_dept_id,
-        b.mediate_dept_name
+        b.mediate_unit_id,
+        b.mediate_unit_name,
+        b.assist_unit_id,
+        b.assist_unit_name,
+        b.close_time,
+        b.agree_type,
+        b.agree_type_name,
+        b.agree_content
     </sql>
     <!-- 字段 -->
     <sql id="column-part">
@@ -531,6 +557,21 @@
         </if>
     </sql>
     <!-- 更新对象 -->
+    <update id="updateCaseInfoList">
+        update
+        <include refid="table-name"/>
+        <set>
+            <include refid="set-part"/>
+        </set>
+        <where>
+            id IN
+            <foreach item="id" collection="caseIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </where>
+    </update>
+
+    <!-- 批量更新对象 -->
     <update id="updateCaseInfo">
         update
         <include refid="table-name"/>
@@ -541,6 +582,7 @@
             id = #{entity.id}
         </where>
     </update>
+
     <!-- 条件更新对象 -->
     <update id="updateCaseInfoTerms">
         update
@@ -596,7 +638,7 @@
         select
         COUNT(1)
         from
-        dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.case_id
+        dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.id
         <include refid="where-part-all"/>
     </select>
     <!--  根据条件分页查询  -->
@@ -604,7 +646,7 @@
         SELECT
         <include refid="column-part-all"/>
         FROM
-        dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.case_id
+        dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.id
         <include refid="where-part-all"/>
         <if test="page.sort != null">
             <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">

--
Gitblit v1.8.0