From 69aad5671f848c0b96cc592efd9186963bae5bb0 Mon Sep 17 00:00:00 2001 From: liyj <1003249715@qq.com> Date: Mon, 09 Sep 2024 10:41:20 +0800 Subject: [PATCH] 1、去掉纠纷信息扩展表的caseId --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml index 2890856..0899569 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml @@ -12,7 +12,6 @@ <!-- 结果集 --> <resultMap id="dataResult" type="cn.huge.module.cases.domain.po.CaseInfoUnfold"> <result property="id" column="id"/> - <result property="caseId" column="case_id"/> <result property="mediateUnitId" column="mediate_unit_id"/> <result property="mediateUnitName" column="mediate_unit_name"/> <result property="mediateDeptId" column="mediate_dept_id"/> @@ -55,13 +54,14 @@ <result property="custId" column="cust_id"/> <result property="createTime" column="create_time"/> <result property="updateTime" column="update_time"/> + <result property="acceptTime" column="accept_time"/> + <result property="closeTime" column="close_time"/> </resultMap> <!-- 表 --> <sql id='table-name'>dyh_case_info_unfold</sql> <!-- 字段 --> <sql id="column-part"> id, - case_id, mediate_unit_id, mediate_unit_name, mediate_dept_id, @@ -103,11 +103,12 @@ party_joy, cust_id, create_time, - update_time + update_time, + accept_time, + close_time </sql> <!-- 更新实体字段 --> <sql id="set-part"> - <if test="entity.caseId != null">case_id = #{entity.caseId},</if> <if test="entity.mediateUnitId != null">mediate_unit_id = #{entity.mediateUnitId},</if> <if test="entity.mediateUnitName != null">mediate_unit_name = #{entity.mediateUnitName},</if> <if test="entity.mediateDeptId != null">mediate_dept_id = #{entity.mediateDeptId},</if> @@ -149,7 +150,9 @@ <if test="entity.partyJoy != null">party_joy = #{entity.partyJoy},</if> <if test="entity.custId != null">cust_id = #{entity.custId},</if> <if test="entity.createTime != null">create_time = #{entity.createTime},</if> - <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if> + <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if> + <if test="entity.acceptTime != null">accept_time = #{entity.acceptTime},</if> + <if test="entity.closeTime != null">close_time = #{entity.closeTime},</if> </sql> <!-- 条件 --> <sql id="where-part"> @@ -157,9 +160,6 @@ <where> <if test="terms.id != null and terms.id !=''"> and id = #{terms.id} - </if> - <if test="terms.caseId != null and terms.caseId !=''"> - and case_id = #{terms.caseId} </if> <if test="terms.mediateUnitId != null and terms.mediateUnitId !=''"> and mediate_unit_id = #{terms.mediateUnitId} @@ -295,6 +295,20 @@ and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart} and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd}) </if> + <if test="terms.acceptTime != null and terms.acceptTime !=''"> + and DATE_FORMAT(accept_time,'%Y-%m-%d') = #{terms.acceptTime} + </if> + <if test="terms.acceptTimeStart != null and terms.acceptTimeStart !='' and terms.acceptTimeEnd != null and terms.acceptTimeEnd !=''"> + and (DATE_FORMAT(accept_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.acceptTimeStart} + and DATE_FORMAT(accept_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.acceptTimeEnd}) + </if> + <if test="terms.closeTime != null and terms.closeTime !=''"> + and DATE_FORMAT(close_time,'%Y-%m-%d') = #{terms.closeTime} + </if> + <if test="terms.closeTimeStart != null and terms.closeTimeStart !='' and terms.closeTimeEnd != null and terms.closeTimeEnd !=''"> + and (DATE_FORMAT(close_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.closeTimeStart} + and DATE_FORMAT(close_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.closeTimeEnd}) + </if> </where> </if> </sql> -- Gitblit v1.8.0