From cb54981736771e19e6b954d8cb60f77576671fc5 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Wed, 11 Sep 2024 13:31:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 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 e5d82f0..c252aa5 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
@@ -272,7 +272,7 @@
if (ObjectUtils.isNotEmpty(caseTask)) {
if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
buttonList.add(zxsl);
buttonList.add(jb);
@@ -280,7 +280,7 @@
}
if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
@@ -288,18 +288,18 @@
if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
tabList.add(sbsh);
}
if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
buttonList.add(zxsl);
buttonList.add(jb);
@@ -307,7 +307,7 @@
}
if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
@@ -315,25 +315,25 @@
if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
- tabList.add(sqjl);
+// 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(sqjl);
tabList.add(sbsh);
}
if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
buttonList.add(zxsl);
buttonList.add(jb);
}
if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
@@ -341,13 +341,13 @@
if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
tabList.add(sxbl);
- tabList.add(sqjl);
+// tabList.add(sqjl);
buttonList.add(tjbljl);
buttonList.add(lhczsq);
@@ -355,23 +355,23 @@
}
if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
tabList.add(jash);
}
if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
daxx.setName("信息");
tabList.add(daxx);
tabList.add(lcdb);
- tabList.add(sqjl);
+// tabList.add(sqjl);
}
if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
tabList.add(daxx);
tabList.add(lcdb);
- tabList.add(sqjl);
+// tabList.add(sqjl);
}
}else {
tabList.add(sxxq);
- tabList.add(sqjl);
+// tabList.add(sqjl);
tabList.add(lhczsh);
}
// 封装数据
@@ -402,7 +402,8 @@
lfdj.setHandleUserName(caseInfo.getInputUserName());
}else {
lfdj.setNodeShowName(caseInfo.getCanalName());
- lfdj.setHandleUserName(caseInfo.getInputUserName()+"（当事人）");
+ lfdj.setHandleUnitName(caseInfo.getInputUserName()+"（当事人）");
+ lfdj.setHandleUserName(caseInfo.getInputUserName());
}
lfdj.setHandleUnitName(caseInfo.getInputUnitName());
lfdj.setTaskType(CaseTaskConsts.TASK_TYPE_1);
@@ -411,13 +412,18 @@
handleCaseFlowList.add(lfdj);
// 查询承办组织任务
QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
- caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByAsc("create_time");
+ caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByAsc("id");
List<CaseTask> handleCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
for (CaseTask caseTask: handleCaseTaskList){
CaseFlowDTO caseFlowDTO = new CaseFlowDTO();
if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
- caseFlowDTO.setProcessName(caseInfo.getProcessName());
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
+ caseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ caseFlowDTO.setProcessName(caseTask.getNodeShowName());
+ }else{
+ caseFlowDTO.setProcessName(caseInfo.getProcessName());
+ }
caseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
caseFlowDTO.setTaskType(caseTask.getTaskType());
caseFlowDTO.setStatus(caseTask.getStatus());
--
Gitblit v1.8.0