From 1ac0d92fc65b6e1524b172af4adffbf8974e467b Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 28 Oct 2024 08:00:17 +0800
Subject: [PATCH] 1、新功能优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
index b4e01c1..d942978 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-07 00:06:20
+ * @time:2024-10-14 14:23:35
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.cases.dao.mapper.CaseAppearMapper">
@@ -29,6 +29,9 @@
<result property="auditResult" column="audit_result"/>
<result property="auditResultName" column="audit_result_name"/>
<result property="auditContent" column="audit_content"/>
+ <result property="usetimeHour" column="usetime_hour"/>
+ <result property="overtimeStatus" column="overtime_status"/>
+ <result property="overtimeHour" column="overtime_hour"/>
<result property="deleteStatus" column="delete_status"/>
<result property="custId" column="cust_id"/>
<result property="createTime" column="create_time"/>
@@ -56,6 +59,9 @@
audit_result,
audit_result_name,
audit_content,
+ usetime_hour,
+ overtime_status,
+ overtime_hour,
delete_status,
cust_id,
create_time,
@@ -80,6 +86,9 @@
<if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if>
<if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if>
<if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if>
+ <if test="entity.usetimeHour != null">usetime_hour = #{entity.usetimeHour},</if>
+ <if test="entity.overtimeStatus != null">overtime_status = #{entity.overtimeStatus},</if>
+ <if test="entity.overtimeHour != null">overtime_hour = #{entity.overtimeHour},</if>
<if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
<if test="entity.custId != null">cust_id = #{entity.custId},</if>
<if test="entity.createTime != null">create_time = #{entity.createTime},</if>
@@ -142,6 +151,15 @@
</if>
<if test="terms.auditContent != null and terms.auditContent !=''">
and audit_content = #{terms.auditContent}
+ </if>
+ <if test="terms.usetimeHour != null and terms.usetimeHour !=''">
+ and usetime_hour = #{terms.usetimeHour}
+ </if>
+ <if test="terms.overtimeStatus != null and terms.overtimeStatus !=''">
+ and overtime_status = #{terms.overtimeStatus}
+ </if>
+ <if test="terms.overtimeHour != null and terms.overtimeHour !=''">
+ and overtime_hour = #{terms.overtimeHour}
</if>
<if test="terms.deleteStatus = null and terms.deleteStatus =''">
and delete_status = 0
@@ -280,15 +298,15 @@
and DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
</select>
<!-- 首页-待审核分页查询 -->
<select id="pageMyTaskAppearReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.appear_time as turnaroundTime, t1.appear_unit_name as organizingUnit, t1.appear_content as opinion,
- t2.case_level as caseGrade, t2.canal_name as caseSource, concat(t2.case_type_first_name, '/' ,t2.case_type_name) as caseType,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ t2.case_level as caseGrade, t2.canal_name as caseSource, concat_ws('', ifnull(t2.case_type_first_name, ''), '/' , ifnull(t2.case_type_name, '')) as caseType,
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')) as plaintiffs, concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_appear t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -300,7 +318,7 @@
and DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
</if>
<if test="terms.partyName != null and terms.partyName !=''">
- and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ and concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, ''), ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) like concat('%', #{terms.partyName}, '%')
</if>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -312,4 +330,4 @@
</if>
limit #{page.offset}, #{page.size}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0