From faf08d1b4dfdb3a79fadcc365b9597176ab117fb Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 23 Sep 2024 15:35:12 +0800
Subject: [PATCH] 1、获取tab和button接口优化3 2、工作台接口优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 19 +++++++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 43 +++++++++++++++++----
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 18 ++++++---
3 files changed, 62 insertions(+), 18 deletions(-)
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 e330cb4..2ea8659 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
@@ -369,7 +369,7 @@
* @param size 每页数量
* @param status 状态，1：待分派，2：已分派
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：流转时间；2：分派时限/分派时间；3：事项等级）
+ * @param sortColmn 排序字段（1：流转时间；2：分派时限/分派时间；3：事项等级；4：督办次数）
* @return
*/
@GetMapping("/pageMyTaskFp")
@@ -399,7 +399,11 @@
terms.put("partyName", partyName);
}
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- terms.put("candeUnitId",loginUser.getUnitId());
+ if (status == 1) {
+ terms.put("candeUnitId", loginUser.getUnitId());
+ }else {
+ terms.put("handleUnitId", loginUser.getUnitId());
+ }
terms.put("status", status);
// 排序
Sort sort = null;
@@ -417,6 +421,9 @@
break;
case 3:
sortName = "t2.case_level";
+ break;
+ case 4:
+ sortName = "superviseCount";
break;
}
switch (sortType){
@@ -444,7 +451,7 @@
* @param size 每页数量
* @param status 状态，1：待签收，2：已签收
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：流转时间；2：签收时限/签收时间；3：事项等级）
+ * @param sortColmn 排序字段（1：流转时间；2：签收时限/签收时间；3：事项等级；4：督办次数）
* @return
*/
@GetMapping("/pageMyTaskQs")
@@ -474,7 +481,11 @@
terms.put("partyName", partyName);
}
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- terms.put("candeUnitId",loginUser.getUnitId());
+ if (status == 1) {
+ terms.put("candeUnitId", loginUser.getUnitId());
+ }else {
+ terms.put("handleUnitId", loginUser.getUnitId());
+ }
terms.put("signStatus", status);
// 排序
Sort sort = null;
@@ -492,6 +503,9 @@
break;
case 3:
sortName = "t2.case_level";
+ break;
+ case 4:
+ sortName = "superviseCount";
break;
}
switch (sortType){
@@ -519,7 +533,7 @@
* @param size 每页数量
* @param status 状态，1：待受理，2：已受理，3：不予受理
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：流转时间；2：受理时限/受理时间/不予受理时间；3：事项等级）
+ * @param sortColmn 排序字段（1：流转时间；2：受理时限/受理时间/不予受理时间；3：事项等级；4：督办次数）
* @return
*/
@GetMapping("/pageMyTaskSl")
@@ -553,6 +567,9 @@
break;
case 3:
sortName = "t2.case_level";
+ break;
+ case 4:
+ sortName = "superviseCount";
break;
}
switch (sortType){
@@ -599,7 +616,11 @@
return ReturnSucUtils.getRepInfo(caseDismissService.pageMyTaskBysl(pageRequest, terms));
}else {
terms.put("status", status);
- terms.put("candeUnitId", loginUser.getUnitId());
+ if (status == 1){
+ terms.put("candeUnitId", loginUser.getUnitId());
+ }else {
+ terms.put("handleUnitId", loginUser.getUnitId());
+ }
return ReturnSucUtils.getRepInfo(service.pageMyTaskSl(pageRequest, terms));
}
} catch (Exception e) {
@@ -614,7 +635,7 @@
* @param size 每页数量
* @param caseTaskType 纠纷任务类型（1：我承办的；2：我配合的）
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：流转时间/已办天数；2：分派时限；3：事项等级）
+ * @param sortColmn 排序字段（1：流转时间/已办天数；2：分派时限；3：事项等级；4：督办次数）
* @return
*/
@GetMapping("/pageMyTaskBlz")
@@ -652,6 +673,9 @@
case 3:
sortName = "t2.case_level";
break;
+ case 4:
+ sortName = "superviseCount";
+ break;
}
switch (sortType){
case 1:
@@ -679,7 +703,7 @@
* @param status 状态，0：结案申请，1：已结案
* @param caseTaskType 纠纷任务类型（1：我承办的；2：我配合的）
* @param sortType 排序方式（1：正序；2：倒序）
- * @param sortColmn 排序字段（1：结案申请时间；2：事项等级）
+ * @param sortColmn 排序字段（1：结案申请时间；2：事项等级；3：督办次数）
* @return
*/
@GetMapping("/pageMyTaskBl")
@@ -725,6 +749,9 @@
case 2:
sortName = "t1.case_level";
break;
+ case 3:
+ sortName = "superviseCount";
+ break;
}
switch (sortType){
case 1:
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 a178308..f9849a3 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
@@ -382,8 +382,8 @@
<if test="terms.candeUnitId != null and terms.candeUnitId !=''">
and t1.cande_unit_id = #{terms.candeUnitId}
</if>
- <if test="terms.status != null and terms.status !=''">
- and t1.status = #{terms.status}
+ <if test="terms.handleUnitId != null and terms.handleUnitId !=''">
+ and t1.handle_unit_id = #{terms.handleUnitId}
</if>
<if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
@@ -408,6 +408,7 @@
(t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
and t1.sign_status != 1
and t2.delete_status = 0
+ and t1.status = #{terms.status}
<include refid="myTaskFp-where-part"/>
</select>
<!-- 工作台-待分派分页查询 -->
@@ -424,6 +425,7 @@
(t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP' or t1.node_id = 'DFP')
and t1.sign_status != 1
and t2.delete_status = 0
+ and t1.status = #{terms.status}
<include refid="myTaskFp-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -443,8 +445,8 @@
<if test="terms.candeUnitId != null and terms.candeUnitId !=''">
and t1.cande_unit_id = #{terms.candeUnitId}
</if>
- <if test="terms.signStatus != null and terms.signStatus !=''">
- and t1.sign_status = #{terms.signStatus}
+ <if test="terms.handleUnitId != null and terms.handleUnitId !=''">
+ and t1.handle_unit_id = #{terms.handleUnitId}
</if>
<if test="terms.createTimeStart != null and terms.createTimeStart !='' and terms.createTimeEnd != null and terms.createTimeEnd !=''">
and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createTimeStart}
@@ -468,6 +470,7 @@
where
t2.delete_status = 0
and t1.status = '1'
+ and t1.sign_status = #{terms.signStatus}
<include refid="myTaskQs-where-part"/>
</select>
<!-- 首页-待/已签收分页查询 -->
@@ -482,6 +485,7 @@
where
t2.delete_status = 0
and t1.status = '1'
+ and t1.sign_status = #{terms.signStatus}
<include refid="myTaskQs-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -512,8 +516,8 @@
<if test="terms.candeUnitId != null and terms.candeUnitId !=''">
and t1.cande_unit_id = #{terms.candeUnitId}
</if>
- <if test="terms.status != null and terms.status !=''">
- and t1.status = #{terms.status}
+ <if test="terms.handleUnitId != null and terms.handleUnitId !=''">
+ and t1.handle_unit_id = #{terms.handleUnitId}
</if>
<if test="terms.caseTaskType != null and terms.caseTaskType !=''">
and t1.case_task_type = #{terms.caseTaskType}
@@ -542,6 +546,7 @@
and t2.delete_status = 0
and t1.sign_status != 1
and (t1.handle_result != 3 or t1.handle_result is null)
+ and t1.status = #{terms.status}
<include refid="myTaskSl-where-part"/>
</select>
<!-- 首页-待/已受理分页查询 -->
@@ -558,6 +563,7 @@
and t2.delete_status = 0
and t1.sign_status != 1
and (t1.handle_result != 3 or t1.handle_result is null)
+ and t1.status = #{terms.status}
<include refid="myTaskSl-where-part"/>
<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/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 134c9ef..bbc30dd 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
@@ -289,13 +289,14 @@
// 查询当前任务信息
CaseTask caseTask = mapper.selectById(caseTaskId);
if (ObjectUtils.isNotEmpty(caseTask)) {
- // 任务已完成
+ // 已完成任务
if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
// 不予受理
if (ObjectUtils.isNotEmpty(caseTask.getHandleResult()) && CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
tabList.add(byslxq);
tabList.add(sqjl);
}else {
+ // 正常任务
CaseInfo caseInfo = caseInfoService.getById(caseTask.getCaseId());
if (CaseProcessBaseConstsEnum.CASE_PROCESS_6.getIndex() != caseInfo.getProcess()){
daxx.setName("详情");
@@ -306,6 +307,7 @@
}
}else {
// 进行中任务
+ // 待分派节点
if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())
|| FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())
|| FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
@@ -322,6 +324,7 @@
daxx.setName("详情");
tabList.add(daxx);
}
+ // 待受理节点
if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())
|| FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())
|| FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
@@ -336,6 +339,7 @@
daxx.setName("详情");
tabList.add(daxx);
}
+ // 回退审核节点
if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())
|| FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())
|| FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())
@@ -349,6 +353,7 @@
daxx.setName("详情");
tabList.add(daxx);
}
+ // 上报审核节点
if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())
|| FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
@@ -360,6 +365,7 @@
daxx.setName("详情");
tabList.add(daxx);
}
+ // 办理反馈节点
if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
tabList.add(sxxq);
@@ -370,7 +376,7 @@
buttonList.add(tjbljl);
buttonList.add(lhczsq);
buttonList.add(jasq);
- buttonList.add(db);
+// buttonList.add(db);
// 额外单独给详情跳转查看
daxx.setName("详情");
@@ -388,6 +394,7 @@
tabList.add(daxx);
}
}
+ // 结案审核节点
if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
tabList.add(sqjl);
@@ -397,17 +404,20 @@
daxx.setName("详情");
tabList.add(daxx);
}
+ // 当事人评价节点
if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
daxx.setName("详情");
tabList.add(daxx);
tabList.add(lcdb);
tabList.add(sqjl);
}
+ // 结案归档节点
if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
tabList.add(daxx);
tabList.add(lcdb);
tabList.add(sqjl);
}
+ // 联合处置-待受理
if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
tabList.add(sqjl);
@@ -421,9 +431,10 @@
}
}
}else {
- tabList.add(sxxq);
+ daxx.setName("详情");
+ tabList.add(daxx);
+ tabList.add(lcdb);
tabList.add(sqjl);
- tabList.add(lhczsh);
}
// 封装数据
TabButtonDTO tabButtonDTO = new TabButtonDTO();
--
Gitblit v1.8.0