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 | 89 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 80 insertions(+), 9 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 cb3b629..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
@@ -70,6 +70,8 @@
<result property="statusName" column="status_name"/>
<result property="process" column="process"/>
<result property="processName" column="process_name"/>
+ <result property="infoProcess" column="info_process"/>
+ <result property="infoProcessName" column="info_process_name"/>
<result property="wantUnitId" column="want_unit_id"/>
<result property="wantUnitName" column="want_unit_name"/>
<result property="wantUserId" column="want_user_id"/>
@@ -80,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>
@@ -95,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">
@@ -160,6 +188,8 @@
status_name,
process,
process_name,
+ info_process,
+ info_process_name,
want_unit_id,
want_unit_name,
want_user_id,
@@ -229,6 +259,8 @@
<if test="entity.statusName != null">status_name = #{entity.statusName},</if>
<if test="entity.process != null">process = #{entity.process},</if>
<if test="entity.processName != null">process_name = #{entity.processName},</if>
+ <if test="entity.infoProcess != null">info_process = #{entity.infoProcess},</if>
+ <if test="entity.infoProcessName != null">info_process_name = #{entity.infoProcessName},</if>
<if test="entity.wantUnitId != null">want_unit_id = #{entity.wantUnitId},</if>
<if test="entity.wantUnitName != null">want_unit_name = #{entity.wantUnitName},</if>
<if test="entity.wantUserId != null">want_user_id = #{entity.wantUserId},</if>
@@ -268,6 +300,23 @@
<if test="terms.inputUnitName != null and terms.inputUnitName !=''">
and a.input_unit_name = #{terms.inputUnitName}
</if>
+ <if test="terms.visitTimeStart != null and terms.visitTimeStart !='' and terms.visitTimeEnd != null and terms.visitTimeEnd !=''">
+ and (DATE_FORMAT(a.visit_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.visitTimeStart}
+ and DATE_FORMAT(a.visit_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.visitTimeEnd})
+ </if>
+ <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+ and (DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.createStart}
+ and DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.createEnd})
+ </if>
+ <if test="terms.closeStart != null and terms.closeStart !='' and terms.closeEnd != null and terms.closeEnd !=''">
+ and (DATE_FORMAT(b.close_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.closeStart}
+ and DATE_FORMAT(b.close_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.closeEnd})
+ </if>
+ <if test="terms.fileStart != null and terms.fileStart !='' and terms.fileEnd != null and terms.fileEnd !=''">
+ and (DATE_FORMAT(b.file_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.fileStart}
+ and DATE_FORMAT(b.file_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.fileEnd})
+ </if>
+
</if>
</sql>
<!-- 条件 -->
@@ -276,8 +325,8 @@
<where>
<if test="terms.ids != null and terms.ids.size > 0">
and id in
- <foreach collection="terms.id" item="terms.ids" index="index" open="(" separator="," close=")">
- #{terms.id}
+ <foreach collection="terms.ids" item="id" index="index" open="(" separator="," close=")">
+ #{id}
</foreach>
</if>
<if test="terms.id != null and terms.id !=''">
@@ -453,8 +502,8 @@
</if>
<if test="terms.processList != null and terms.processList.size > 0">
and process in
- <foreach collection="terms.process" item="terms.processList" index="index" open="(" separator="," close=")">
- #{terms.process}
+ <foreach collection="terms.processList" item="process" index="index" open="(" separator="," close=")">
+ #{process}
</foreach>
</if>
<if test="terms.process != null and terms.process !=''">
@@ -462,6 +511,12 @@
</if>
<if test="terms.processName != null and terms.processName !=''">
and process_name = #{terms.processName}
+ </if>
+ <if test="terms.infoProcess != null and terms.infoProcess !=''">
+ and info_process = #{terms.infoProcess}
+ </if>
+ <if test="terms.infoProcessName != null and terms.infoProcessName !=''">
+ and info_process_name = #{terms.infoProcessName}
</if>
<if test="terms.wantUnitId != null and terms.wantUnitId !=''">
and want_unit_id = #{terms.wantUnitId}
@@ -502,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"/>
@@ -512,6 +582,7 @@
id = #{entity.id}
</where>
</update>
+
<!-- 条件更新对象 -->
<update id="updateCaseInfoTerms">
update
@@ -567,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>
<!-- 根据条件分页查询 -->
@@ -575,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