From f14df7c0b6aea2dbe393f9ada08b23be3f476e5a Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 11 Oct 2024 16:59:02 +0800
Subject: [PATCH] 网格系统账号体系对接接口调整
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
index 172bc96..25b641f 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
@@ -228,7 +228,7 @@
<include refid="table-name" />
where case_id = #{terms.caseId}
and delete_status = 0
- <if test="terms.quiltUnitId == 1">
+ <if test="terms.type == 1">
and sup_status = #{terms.supStatus}
and quilt_unit_id = #{terms.quiltUnitId}
</if>
@@ -242,7 +242,7 @@
<include refid="table-name" />
where case_id = #{terms.caseId}
and delete_status = 0
- <if test="terms.quiltUnitId == 1">
+ <if test="terms.type == 1">
and sup_status = #{terms.supStatus}
and quilt_unit_id = #{terms.quiltUnitId}
</if>
@@ -278,6 +278,9 @@
<result property="reason" column="reason"/>
<result property="opinion" column="opinion"/>
<result property="process" column="process"/>
+ <result property="content" column="content"/>
+ <result property="applyStatus" column="applyStatus"/>
+ <result property="replyTime" column="replyTime"/>
</resultMap>
<!-- 首页督办条件统计 -->
@@ -288,8 +291,13 @@
dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
t1.delete_status = 0
- and t1.sup_status = #{terms.supStatus}
- and t1.quilt_unit_id = #{terms.quiltUnitId}
+ <if test="terms.type != 3">
+ and t1.quilt_unit_id = #{terms.quiltUnitId}
+ and t1.sup_status = #{terms.supStatus}
+ </if>
+ <if test="terms.type == 3">
+ and t1.sup_unit_id = #{terms.supUnitId}
+ </if>
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
@@ -301,20 +309,20 @@
<!-- 首页督办分页查询 -->
<select id="pageMyTaskDb" resultMap="MyTaskApplyReviewResult">
- SELECT t1.id as ownerId, t1.case_id as caseId,
+ SELECT t1.id as ownerId, t1.case_id as caseId, t1.reply_content as content, t1.sup_status as applyStatus, t1.reply_time as replyTime,
t1.sup_time as turnaroundTime, DATEADD(hour, t1.reply_term, t1.sup_time) as timeLimit, t1.sup_unit_name as organizingUnit,
t1.sup_content as opinion, 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.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_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
t1.delete_status = 0
- <if test="terms.quiltUnitId != null and terms.quiltUnitId !=''">
+ <if test="terms.type != 3">
and t1.quilt_unit_id = #{terms.quiltUnitId}
and t1.sup_status = #{terms.supStatus}
</if>
- <if test="terms.supUnitId != null and terms.supUnitId !=''">
+ <if test="terms.type == 3">
and t1.sup_unit_id = #{terms.supUnitId}
</if>
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
--
Gitblit v1.8.0