From dac9b1293fc59f64856bd8f9d6d872cfd5bef715 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 23 Sep 2024 16:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 127 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 66 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 8a588d4..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,86 +307,65 @@
}
}else {
// 进行中任务
- if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
+ // 待分派节点
+ 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())) {
tabList.add(dslxq);
tabList.add(sqjl);
- buttonList.add(zxsl);
+ sl.setName("自行受理");
+ buttonList.add(sl);
buttonList.add(jb);
buttonList.add(sb);
buttonList.add(bysl);
+
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
}
- if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
+ // 待受理节点
+ 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())) {
tabList.add(dslxq);
tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
buttonList.add(bysl);
+
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
}
- if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
+ // 回退审核节点
+ 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())
+ || FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
tabList.add(sqjl);
tabList.add(htsh);
+
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
}
- if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
+ // 上报审核节点
+ if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())
+ || FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
tabList.add(sqjl);
tabList.add(sbsh);
- }
- if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
- tabList.add(sqjl);
- buttonList.add(zxsl);
- buttonList.add(jb);
- buttonList.add(sb);
- buttonList.add(bysl);
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
}
- if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
- tabList.add(sqjl);
-
- buttonList.add(sl);
- buttonList.add(ht);
- buttonList.add(bysl);
- }
- if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
- tabList.add(sqjl);
- tabList.add(htsh);
- }
- if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
- tabList.add(sqjl);
- tabList.add(sbsh);
- }
- if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
- tabList.add(sqjl);
-
- buttonList.add(zxsl);
- buttonList.add(jb);
- buttonList.add(bysl);
- }
- if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
- tabList.add(sqjl);
-
- buttonList.add(sl);
- buttonList.add(ht);
- buttonList.add(bysl);
- }
- if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
- tabList.add(sqjl);
- tabList.add(htsh);
- }
+ // 办理反馈节点
if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
tabList.add(sxxq);
@@ -396,7 +376,11 @@
buttonList.add(tjbljl);
buttonList.add(lhczsq);
buttonList.add(jasq);
- buttonList.add(db);
+// buttonList.add(db);
+
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
} else {
tabList.add(sxxq);
tabList.add(sxbl);
@@ -404,42 +388,53 @@
tabList.add(sqjl);
buttonList.add(tjbljl);
+
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
}
}
+ // 结案审核节点
if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
tabList.add(sqjl);
tabList.add(jash);
+
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
}
+ // 当事人评价节点
if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
- daxx.setName("信息");
+ 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);
buttonList.add(sl);
buttonList.add(ht);
- }
- if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
- sxxq.setName("详情");
- tabList.add(sxxq);
- tabList.add(sqjl);
- tabList.add(htsh);
+
+ // 额外单独给详情跳转查看
+ daxx.setName("详情");
+ tabList.add(daxx);
}
}
}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