From b512f03e1ea30e22209ec5a889d568c45f3e03c9 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 13 Sep 2024 10:41:03 +0800
Subject: [PATCH] 1、删除经办人 2、规范代码
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java | 51 ++++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 53 +++++---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml | 4
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java | 4
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 6
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 16 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 14 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java | 27 ++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml | 17 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoUnfoldMapper.java | 6 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoUnfoldWebController.java | 16 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml | 4
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml | 4
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 13 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java | 7 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java | 7 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java | 29 ++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAppearService.java | 27 ++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml | 11 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 32 ++++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 12 +-
21 files changed, 307 insertions(+), 53 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoUnfoldWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoUnfoldWebController.java
index 9d39771..61c899e 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoUnfoldWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoUnfoldWebController.java
@@ -397,4 +397,20 @@
return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
+
+ /**
+ * PC端-删除经办人
+ * @url {ctx}/api/web/caseInfoUnfold/deletePrincipal?
+ * @param caseId 纠纷编号
+ * @return Object
+ */
+ @GetMapping("/deletePrincipal")
+ public Object deletePrincipal(@RequestParam(value = "caseId") String caseId) {
+ try {
+ service.deletePrincipal(caseId);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index 003a6b4..7b53fdb 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -99,13 +99,13 @@
/**
* web端-签收
* @url {ctx}/api/web/caseTask/sign
- * @param signTaskDTO 签收表单
+ * @param signTaskDTOList 签收表单数组
* @return Object
*/
@PostMapping("/sign")
- public Object sign(@RequestBody SignTaskDTO signTaskDTO, @CurrentUser String userId) {
+ public Object sign(@RequestBody List<SignTaskDTO> signTaskDTOList, @CurrentUser String userId) {
try {
- service.webSign(signTaskDTO, userId);
+ service.webSign(signTaskDTOList, userId);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java
index 29f3b59..ed1d224 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java
@@ -28,6 +28,13 @@
void updateCaseInfo(@Param("entity") CaseInfo entity);
/**
+ * 批量更新对象
+ * @param entity 对象
+ * @param caseIdList
+ */
+ void updateCaseInfoList(@Param("entity") CaseInfo entity, @Param("caseIdList")List<String> caseIdList);
+
+ /**
* 条件更新对象
* @param entity 对象
* @param terms 条件
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoUnfoldMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoUnfoldMapper.java
index 2ad1af3..f2fa5d5 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoUnfoldMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoUnfoldMapper.java
@@ -61,4 +61,10 @@
*/
List<CaseInfoUnfold> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+ /**
+ * 更新对象
+ * @param id
+ */
+ void deletePrincipal(@Param("id") String id);
+
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
index ec66937..495045b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
@@ -29,6 +29,13 @@
void updateCaseTask(@Param("entity") CaseTask entity);
/**
+ * 批量更新对象
+ * @param caseTaskPO 对象
+ * @param taskIdList
+ */
+ void updateCaseTaskList(@Param("caseTaskPO") CaseTask caseTaskPO, @Param("taskIdList") List<String> taskIdList);
+
+ /**
* 条件更新对象
* @param entity 对象
* @param terms 条件
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java
index 88f8673..0272ecc 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java
@@ -83,7 +83,7 @@
* @param terms 条件
* @return List<FrontPageListDTO>
*/
- List<FrontPageListDTO> pageMyTaskApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+ List<FrontPageListDTO> listMyTaskApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
/**
* 首页-待审核条件统计
@@ -98,5 +98,5 @@
* @param terms 条件
* @return List<FrontPageListDTO>
*/
- List<FrontPageListDTO> pageMySubmitApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+ List<FrontPageListDTO> listMySubmitApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
index 9082fe1..b2d442b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml
@@ -278,7 +278,7 @@
and DATE_FORMAT(t1.appear_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>
<!-- 首页-待审核分页查询 -->
@@ -298,7 +298,7 @@
and DATE_FORMAT(t1.appear_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 ">
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..038a212 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
@@ -284,7 +284,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>
</select>
<!-- 首页-待审核分页查询 -->
@@ -304,7 +304,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 ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 7b0e551..1b530d0 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -531,6 +531,21 @@
</if>
</sql>
<!-- 更新对象 -->
+ <update id="updateCaseInfoList">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id IN
+ <foreach item="id" collection="caseIdList" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </where>
+ </update>
+
+ <!-- 批量更新对象 -->
<update id="updateCaseInfo">
update
<include refid="table-name"/>
@@ -541,6 +556,7 @@
id = #{entity.id}
</where>
</update>
+
<!-- 条件更新对象 -->
<update id="updateCaseInfoTerms">
update
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml
index 1704778..de1ed1d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoUnfoldMapper.xml
@@ -376,4 +376,15 @@
limit #{page.offset}, #{page.size}
</select>
+ <!-- 更新对象 -->
+ <update id="deletePrincipal">
+ update
+ dyh_case_info_unfold
+ set
+ mediator_id = null,
+ mediator = null,
+ mediator_mobile = null
+ where
+ id = #{id}
+ </update>
</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
index 91a616d..805e5c8 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml
@@ -278,7 +278,7 @@
and DATE_FORMAT(t1.return_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>
@@ -299,7 +299,7 @@
and DATE_FORMAT(t1.return_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 ">
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 59f64e4..3f75eab 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
@@ -260,15 +260,22 @@
from
dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
- delete_status = 0
- and sup_status = #{terms.supStatus}
- and quilt_unit_id = #{terms.quiltUnitId}
+ t1.delete_status = 0
+ and t1.sup_status = #{terms.supStatus}
+ and t1.quilt_unit_id = #{terms.quiltUnitId}
+ <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})
+ </if>
+ <if test="terms.partyName != null and terms.partyName !=''">
+ and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
+ </if>
</select>
<!-- 首页督办分页查询 -->
<select id="pageMyTaskDb" resultMap="dataResult">
SELECT
- t1.sup_time as turnaroundTime, t1.DATEADD(hour, t1.replyTerm, t1.sup_time) as timeLimit, t1.sup_unit_name as organizingUnit,
+ 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.defendants, t2.dagents) as defendants
@@ -283,7 +290,7 @@
and DATE_FORMAT(t1.create_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 ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
index 91268df..dc225e9 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -288,6 +288,22 @@
id = #{entity.id}
</where>
</update>
+
+ <!-- 批量对象 -->
+ <update id="updateCaseTaskList">
+ update
+ <include refid="table-name"/>
+ <set>
+ <include refid="set-part"/>
+ </set>
+ <where>
+ id IN
+ <foreach item="id" collection="taskIdList" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </where>
+ </update>
+
<!-- 条件更新对象 -->
<update id="updateCaseTaskTerms">
update
@@ -398,7 +414,7 @@
and DATE_FORMAT(t1.create_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>
<!-- 首页-待分派分页查询 -->
@@ -418,7 +434,7 @@
and DATE_FORMAT(t1.create_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 ">
@@ -447,7 +463,7 @@
and DATE_FORMAT(t1.create_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>
<!-- 首页-待签收分页查询 -->
@@ -468,7 +484,7 @@
and DATE_FORMAT(t1.create_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 ">
@@ -498,7 +514,7 @@
and DATE_FORMAT(t1.create_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>
<!-- 首页-待受理分页查询 -->
@@ -521,7 +537,7 @@
and DATE_FORMAT(t1.create_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 ">
@@ -550,7 +566,7 @@
and DATE_FORMAT(t1.create_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>
<!-- 首页-办理中分页查询 -->
@@ -571,7 +587,7 @@
and DATE_FORMAT(t1.create_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 ">
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..4e03003 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,11 +365,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="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,
@@ -386,7 +386,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 ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAppearService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAppearService.java
index 02505e5..4282a61 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAppearService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAppearService.java
@@ -3,6 +3,7 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseReturn;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseAppearMapper;
@@ -148,4 +149,30 @@
}
}
+ /**
+ * 首页查询
+ * @param auditUnitId 审核组织编号
+ * @return long
+ */
+ public long countAppearReview(String auditUnitId){
+ return mapper.countAppearReview(auditUnitId);
+ }
+
+ /**
+ * 首页-待审核条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countMyTaskAppearReview(Map<String, Object> terms){
+ return mapper.countMyTaskAppearReview(terms);
+ }
+
+ /**
+ * 首页-待审核分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ */
+ public List<FrontPageListDTO> pageMyTaskAppearReview(PageRequest page, Map<String, Object> terms){
+ return mapper.pageMyTaskAppearReview(page, terms);
+ }
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
index bde0bd2..b0354a1 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
@@ -3,6 +3,7 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
@@ -217,4 +218,32 @@
}
return caseAssistApply;
}
+
+ /**
+ * 首页查询
+ * @param auditUnitId 审核组织编号
+ * @return long
+ */
+ public long countAssistReview(String auditUnitId){
+ return mapper.countAssistReview(auditUnitId);
+ }
+
+ /**
+ * 首页-待审核条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countMyTaskAssistReview(Map<String, Object> terms){
+ return mapper.countMyTaskAssistReview(terms);
+ }
+
+ /**
+ * 按条件查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return List
+ */
+ public List<FrontPageListDTO> pageMyTaskAssistReview(PageRequest page, Map<String, Object> terms){
+ return mapper.pageMyTaskAssistReview(page, terms);
+ }
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index 64316b4..fb00ddf 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -96,6 +96,20 @@
}
/**
+ * 批量更新对象
+ * @param entity 对象
+ * @param caseIdList
+ */
+ public void updateCaseInfoList(CaseInfo entity, List<String> caseIdList){
+ try{
+ mapper.updateCaseInfoList(entity, caseIdList);
+ }catch (Exception e){
+ log.error("[CaseInfoService.updateCaseInfoList]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoService.updateCaseInfoList", e);
+ }
+ }
+
+ /**
* 条件更新对象
* @param entity 对象
* @param terms 条件
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
index 090f220..abe9633 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
@@ -174,6 +174,19 @@
}
}
+ /**
+ * PC端-删除经办人
+ * @param caseId 对象
+ */
+ public void deletePrincipal(String caseId){
+ try{
+ mapper.deletePrincipal(caseId);
+ }catch (Exception e){
+ log.error("[CaseInfoUnfoldService.choosePrincipal]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoUnfoldService.choosePrincipal", e);
+ }
+ }
+
public TransactResultDTO getTransactResult(String caseId){
try {
//查询办理结果信息
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java
index ca2a7e0..6aee2aa 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseReturnService.java
@@ -3,6 +3,7 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
+import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseWindupApply;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseReturnMapper;
@@ -148,4 +149,30 @@
}
}
+ /**
+ * 首页查询
+ * @param auditUnitId 审核组织编号
+ * @return long
+ */
+ public long countReturnReview(String auditUnitId){
+ return mapper.countReturnReview(auditUnitId);
+ }
+
+ /**
+ * 首页-待审核条件统计
+ * @param terms 条件
+ * @return long
+ */
+ public long countMyTaskReturnReview(Map<String, Object> terms){
+ return mapper.countMyTaskReturnReview(terms);
+ }
+
+ /**
+ * 首页-待审核分页查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<FrontPageListDTO> pageMyTaskReturnReview(PageRequest page, Map<String, Object> terms){
+ return mapper.pageMyTaskReturnReview(page, terms);
+ }
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 3acafae..c769b23 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -91,7 +91,7 @@
@Autowired
private CaseWindupApplyService caseWindupApplyService;
@Autowired
- private CaseAssistApplyService assistApplyService;
+ private CaseAssistApplyService caseAssistApplyService;
@Autowired
private CaseAppearService caseAppearService;
@Autowired
@@ -555,10 +555,10 @@
FrontPageCountDTO frontPageCountDTO = mapper.countTaskList(terms);
long supervise = superviseService.countCaseSuperviseList(0,loginUser.getUnitId());
frontPageCountDTO.setSupervise(supervise);
- long countApplyReview = caseWindupApplyMapper.countApplyReview(loginUser.getUnitId());
- long countReturnReview = caseReturnMapper.countReturnReview(loginUser.getUnitId());
- long countAppearReview = caseAppearMapper.countAppearReview(loginUser.getUnitId());
- long countAssistReview = caseAssistApplyMapper.countAssistReview(loginUser.getUnitId());
+ long countApplyReview = caseWindupApplyService.countApplyReview(loginUser.getUnitId());
+ long countReturnReview = caseReturnService.countReturnReview(loginUser.getUnitId());
+ long countAppearReview = caseAppearService.countAppearReview(loginUser.getUnitId());
+ long countAssistReview = caseAssistApplyService.countAssistReview(loginUser.getUnitId());
frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview);
return frontPageCountDTO;
}catch (Exception e) {
@@ -646,7 +646,7 @@
for(CaseInfoUnfold unfold: unfoldList){
for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
+ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
}
}
@@ -668,8 +668,8 @@
*/
public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
try {
- long total = caseWindupApplyMapper.countMySubmitApplyReview(terms);
- List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyMapper.pageMySubmitApplyReview(page, terms);
+ long total = caseWindupApplyService.countMySubmitApplyReview(terms);
+ List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyService.listMySubmitApplyReview(page, terms);
List<String> caseIdList = new ArrayList<>();
caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
@@ -680,7 +680,7 @@
for(CaseInfoUnfold unfold: unfoldList){
for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
+ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
}
}
@@ -704,17 +704,17 @@
long total = 0;
List<FrontPageListDTO> frontPageListDTOList = new ArrayList<>();
if(1 == type){
- total = caseReturnMapper.countMyTaskReturnReview(terms);
- frontPageListDTOList = caseReturnMapper.pageMyTaskReturnReview(page,terms);
+ total = caseReturnService.countMyTaskReturnReview(terms);
+ frontPageListDTOList = caseReturnService.pageMyTaskReturnReview(page,terms);
}else if(2 == type){
- total = caseAppearMapper.countMyTaskAppearReview(terms);
- frontPageListDTOList = caseAppearMapper.pageMyTaskAppearReview(page, terms);
+ total = caseAppearService.countMyTaskAppearReview(terms);
+ frontPageListDTOList = caseAppearService.pageMyTaskAppearReview(page, terms);
}else if(3 == type){
- total = caseWindupApplyMapper.countMyTaskApplyReview(terms);
- frontPageListDTOList = caseWindupApplyMapper.pageMyTaskApplyReview(page, terms);
+ total = caseWindupApplyService.countMyTaskApplyReview(terms);
+ frontPageListDTOList = caseWindupApplyService.listMyTaskApplyReview(page, terms);
}else if(4 == type){
- total = caseAssistApplyMapper.countMyTaskAssistReview(terms);
- frontPageListDTOList = caseAssistApplyMapper.pageMyTaskAssistReview(page, terms);
+ total = caseAssistApplyService.countMyTaskAssistReview(terms);
+ frontPageListDTOList = caseAssistApplyService.pageMyTaskAssistReview(page, terms);
}
return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
}catch (Exception e) {
@@ -1114,27 +1114,28 @@
/**
* web端任务处理-签收
- * @param signTaskDTO 签收任务表单
+ * @param signTaskDTOList 签收任务表单
* @param userId 当前登录用户
*/
- public void webSign(SignTaskDTO signTaskDTO, String userId){
+ public void webSign(List<SignTaskDTO> signTaskDTOList, String userId){
try{
Date nowDate = DateUtils.getNowDate();
// 获取当前登录用户
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ List<String> taskIdList = new ArrayList<>();
+ List<String> caseIdList = new ArrayList<>();
+
// 更新纠纷任务信息
CaseTask caseTaskPO = new CaseTask();
- caseTaskPO.setId(signTaskDTO.getCaseTaskId());
caseTaskPO.setSignStatus(CaseTaskConsts.SIGN_STATUS_2);
caseTaskPO.setSignTime(nowDate);
caseTaskPO.setSignUserId(loginUser.getId());
caseTaskPO.setSignUserName(loginUser.getTrueName());
caseTaskPO.setHandleIllust("已签收");
caseTaskPO.setUpdateTime(nowDate);
- mapper.updateCaseTask(caseTaskPO);
+
// 更新纠纷信息
CaseInfo caseInfoPO = new CaseInfo();
- caseInfoPO.setId(signTaskDTO.getCaseId());
caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex());
caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_3.getDes());
caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
@@ -1142,7 +1143,13 @@
caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
caseInfoPO.setUpdateTime(nowDate);
- caseInfoService.updateCaseInfo(caseInfoPO);
+
+ for(SignTaskDTO signTaskDTO: signTaskDTOList){
+ taskIdList.add(signTaskDTO.getCaseTaskId());
+ caseIdList.add(signTaskDTO.getCaseId());
+ }
+ mapper.updateCaseTaskList(caseTaskPO, taskIdList);
+ caseInfoService.updateCaseInfoList(caseInfoPO, caseIdList);
}catch (Exception e){
log.error("[CaseTaskService.webSign]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webSign", e);
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java
index 3b6f423..42a6a3d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java
@@ -4,6 +4,7 @@
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseWindupApplyMapper;
@@ -158,4 +159,54 @@
}
}
+ /**
+ * 首页-待审核分页查询
+ * @param terms 条件
+ * @return Page
+ */
+ public long countMyTaskApplyReview(Map<String, Object> terms){
+ long total = mapper.countMyTaskApplyReview(terms);
+ return total;
+ }
+
+ /**
+ * 首页-待审核查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public List<FrontPageListDTO> listMyTaskApplyReview(PageRequest page, Map<String, Object> terms){
+ List<FrontPageListDTO> frontPageListDTOList = mapper.listMyTaskApplyReview(page, terms);
+ return frontPageListDTOList;
+ }
+
+ /**
+ * 首页-查询数量
+ * @param auditUnitId 条件
+ * @return Page
+ */
+ public long countApplyReview(String auditUnitId){
+ return mapper.countApplyReview(auditUnitId);
+ }
+
+ /**
+ * 首页-查询待办任务-办理任务数量统计
+ * @param terms 条件
+ * @return Page
+ */
+ public long countMySubmitApplyReview(Map<String, Object> terms){
+ long total = mapper.countMySubmitApplyReview(terms);
+ return total;
+ }
+
+ /**
+ * 首页-查询待办任务-办理任务
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public List<FrontPageListDTO> listMySubmitApplyReview(PageRequest page, Map<String, Object> terms){
+ List<FrontPageListDTO> frontPageListDTOList = mapper.listMySubmitApplyReview(page, terms);
+ return frontPageListDTOList;
+ }
}
--
Gitblit v1.8.0