From 2c0b07b09ab772646e973983e4fb6cddbd3664dc Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Tue, 24 Sep 2024 17:28:05 +0800
Subject: [PATCH] 督办列表修改新增字段、新增排序 待审核列表修改新增字段、新增排序

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 c375f78..459aaa8 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
@@ -267,6 +267,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,14 +286,14 @@
             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(t2.plaintiffs, t2.pagents, t2.defendants, 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,
+        t1.apply_content as reason,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
         FROM
         dyh_case_assist_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
@@ -304,7 +306,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(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
         </if>
         <if test="page.sort != null">
             <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">

--
Gitblit v1.8.0