From dfa813134c05b718c039c432f0fa7be3cc118fd3 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Wed, 25 Sep 2024 00:34:47 +0800
Subject: [PATCH] 综合查询-排序
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
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..e01eeed 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();
@@ -517,6 +528,8 @@
if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
+ webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUserName());
+ webCaseFlowDTO.setHandleUserName(null);
}else{
webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
}
@@ -757,6 +770,10 @@
long countReturnReview = caseReturnService.countReturnReview(loginUser.getUnitId());
long countAppearReview = caseAppearService.countAppearReview(loginUser.getUnitId());
long countAssistReview = caseAssistApplyService.countAssistReview(loginUser.getUnitId());
+ frontPageCountDTO.setReturnReview(countReturnReview);
+ frontPageCountDTO.setAppearReview(countAppearReview);
+ frontPageCountDTO.setWindupReview(countApplyReview);
+ frontPageCountDTO.setAssistReview(countAssistReview);
frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview);
// 已办
Map<String, Object> ybTerms = new HashMap<>();
--
Gitblit v1.8.0