From e142433c71b032ce85546477543d65da0f3986b8 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 21 Sep 2024 13:20:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 de3c2d2..6c8d2bc 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
@@ -316,11 +316,11 @@
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="pageMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
+ <select id="listMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId,
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,
@@ -337,7 +337,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 ">
@@ -365,18 +365,20 @@
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="pageMySubmitApplyReview" resultMap="MyTaskApplyReviewResult">
+ <select id="listMySubmitApplyReview" resultMap="MyTaskApplyReviewResult">
SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t2.process_name as process,
t1.apply_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
t1.medi_result_name as mediResult,t1.fail_reason as reason,
concat(t2.plaintiffs, t2.pagents) as plaintiffs,
- concat(t2.defendants, t2.dagents) as defendants
+ concat(t2.defendants, t2.dagents) as defendants,
+ t3.mediator as manager
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
where
t1.delete_status = 0
and t1.apply_status = #{terms.applyStatus}
@@ -386,7 +388,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