From 051effad5a4885f28c4ead26e8e8c0da1b3d91d2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 21 Oct 2024 21:32:45 +0800
Subject: [PATCH] 1、工作视窗报错修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
index ab727a8..fa30602 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
@@ -5,7 +5,7 @@
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
* @author: liyj
- * @time:2024-09-06 23:57:02
+ * @time:2024-10-14 14:23:35
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.cases.dao.mapper.CaseWindupApplyMapper">
@@ -35,6 +35,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"/>
@@ -68,6 +71,9 @@
audit_result,
audit_result_name,
audit_content,
+ usetime_hour,
+ overtime_status,
+ overtime_hour,
delete_status,
cust_id,
create_time,
@@ -98,6 +104,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>
@@ -178,6 +187,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
@@ -299,6 +317,8 @@
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
<result property="process" column="process"/>
+ <result property="auditTime" column="auditTime"/>
+ <result property="auditResult" column="auditResult"/>
</resultMap>
<!-- 首页-待审核条件统计 -->
@@ -316,16 +336,16 @@
and DATE_FORMAT(t1.apply_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="listMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
+ SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t1.audit_time as auditTime, t1.audit_result_name as auditResult,
t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,
t1.fail_reason as reason, t2.case_level as caseGrade, t2.canal_name as caseSource,
- t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
- concat(t2.defendants, t2.dagents) as defendants
+ 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_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -337,7 +357,7 @@
and DATE_FORMAT(t1.apply_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 ">
@@ -368,7 +388,7 @@
and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.applyTimeEnd})
</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>
</sql>
@@ -394,10 +414,10 @@
<if test="terms.applyStatus == 1">
t1.audit_time as turnaroundTime,
</if>
- t1.audit_unit_name as auditUnit, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
+ t1.audit_unit_name as auditUnit, 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,
t3.mediator as manager, t3.assist_unit_name as cooperatingUnit, t3.mediate_unit_name as organizingUnit,
t1.medi_result as mediResult, t1.medi_result_name as mediResultName, t2.status_name as caseStatusName,
- concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
+ concat_ws('', ifnull(t2.plaintiffs, ''), ifnull(t2.pagents, '')) as plaintiffs, concat_ws('', ifnull(t2.defendants, ''), ifnull(t2.dagents, '')) as defendants
FROM
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
left join dyh_case_info_unfold t3 on t3.id = t2.id
@@ -415,4 +435,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