From 7c3418c45926b5288b22044d60dbb12fa2c982d0 Mon Sep 17 00:00:00 2001 From: xusd <hugeinfo123> Date: Fri, 27 Sep 2024 18:02:40 +0800 Subject: [PATCH] 大厅登记接口优化 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 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 d89fc3a..7edc11c 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 @@ -110,6 +110,7 @@ <result property="queRoadName" column="que_road_name"/> <result property="caseTypeFirst" column="case_type_first"/> <result property="caseTypeFirstName" column="case_type_first_name"/> + <result property="caseTaskId" column="caseTaskId"/> </resultMap> <!-- 表 --> <sql id='table-name'>dyh_case_info</sql> @@ -141,7 +142,8 @@ b.close_time, b.agree_type, b.agree_type_name, - b.agree_content + b.agree_content, + c.id as caseTaskId </sql> <!-- 字段 --> <sql id="column-part"> @@ -395,6 +397,9 @@ </if> <if test="terms.id != null and terms.id !=''"> and id = #{terms.id} + </if> + <if test="terms.partyShow != null and terms.partyShow !=''"> + and party_show = #{terms.partyShow} </if> <if test="terms.caseTitle != null and terms.caseTitle !=''"> and case_title = #{terms.caseTitle} @@ -701,8 +706,8 @@ <sql id="where-register-part"> <if test="terms != null"> <where> - <if test="terms.inputUnitName != null and terms.inputUnitName !=''"> - and t1.input_unit_mame = #{inputUnitName} + <if test="terms.inputUnitId != null and terms.inputUnitId !=''"> + and t1.input_unit_id = #{terms.inputUnitId} </if> <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''"> and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart} @@ -751,7 +756,7 @@ dyh_case_info t1 left join dyh_case_info_unfold t2 on t1.id = t2.id left join (select count(*) as number ,case_id from dyh_case_supervise group by case_id) t3 on t3.case_id=t1.id - left join (select id ,case_id from dyh_case_task limit 1) t4 on t1.id = t4.case_id + left join (select id ,case_id from dyh_case_task group by case_id) t4 on t1.id = t4.case_id <include refid="where-register-part"/> <if test="page.sort != null"> <foreach collection="page.sort" item="s" index="index" separator="," open="order by "> @@ -787,6 +792,7 @@ <include refid="column-part-all"/> FROM dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.id + left join (select id ,case_id from dyh_case_task group by case_id) c on a.id = c.case_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