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/CaseAssistApplyMapper.xml | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
index 89a37e1..04913e0 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml
@@ -4,8 +4,8 @@
* @title: 联合处置申请信息表
* @description: 自定义sql，请自行实现业务逻辑
* @company: hugeinfo
- * @author: wangwh
- * @time:2024-09-05 17:25:04
+ * @author: liyj
+ * @time:2024-10-14 14:23:35
* @version 1.0.0
-->
<mapper namespace="cn.huge.module.cases.dao.mapper.CaseAssistApplyMapper">
@@ -29,7 +29,10 @@
<result property="auditTime" column="audit_time"/>
<result property="auditResult" column="audit_result"/>
<result property="auditResultName" column="audit_result_name"/>
- <result property="audit_content" column="audit__content"/>
+ <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"/>
@@ -57,7 +60,10 @@
audit_time,
audit_result,
audit_result_name,
- audit__content,
+ audit_content,
+ usetime_hour,
+ overtime_status,
+ overtime_hour,
delete_status,
cust_id,
create_time,
@@ -82,7 +88,10 @@
<if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if>
<if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if>
<if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if>
- <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</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>
@@ -146,8 +155,17 @@
<if test="terms.auditResultName != null and terms.auditResultName !=''">
and audit_result_name = #{terms.auditResultName}
</if>
- <if test="terms.audit_content != null and terms.audit_content !=''">
- and audit__content = #{terms.audit_content}
+ <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
@@ -267,6 +285,8 @@
<result property="backUnit" column="backUnit"/>
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
+ <result property="auditTime" column="auditTime"/>
+ <result property="auditResult" column="auditResult"/>
</resultMap>
<!-- 首页-待审核统计 -->
@@ -284,15 +304,15 @@
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="pageMyTaskAssistReview" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as ownerId, t1.case_id as CaseId,
+ SELECT t1.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.apply_assist_unit_name as cooperatingUnit,
- t1.apply_content 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
+ t1.apply_content as reason,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_assist_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
@@ -304,7 +324,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 ">
@@ -316,4 +336,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