From 193c672bd2ed10387f3fec7aa1e1d9ddc7160980 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Mon, 21 Oct 2024 23:51:07 +0800
Subject: [PATCH] fix:解纷态势-区域筛选修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 bd50d15..e8ba37a 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
@@ -642,6 +642,7 @@
List<CaseAssistInfo> caseAssistInfoList = caseAssistInfoService.listByCaseId(caseId);
if (CollectionUtils.isNotEmpty(caseAssistInfoList)){
LinkedList<WebAssistCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
+ int i = 0;
for (CaseAssistInfo caseAssistInfo: caseAssistInfoList){
if (CaseTaskConsts.ASSIST_STATUS_0 == caseAssistInfo.getAssistStatus()) {
WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
@@ -795,7 +796,9 @@
assistCaseFlowList.add(webAssistCaseFlowDTO);
}else {
WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
- webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId());
+ // i防止提供给前端的unitId重复
+ i++;
+ webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId()+"_"+i);
webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName()+"（已回退）");
LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
webAssistCaseFlowDTO.setCaseFlowList(caseFlowList);
@@ -1163,7 +1166,7 @@
if (UserBaseConsts.UNIT_GRADE_3 == caseDispBaseDTO.getTargetUnitGrade()) {
// 启动来访登记工作流
FlowNode firstFlowNode = flowInfoService.startFlow(FlowableConsts.getJbFlow(caseInfo.getCanal()), caseInfo.getId());
- if (UserBaseConsts.UNIT_TYPE_1 == caseDispBaseDTO.getTargetUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == caseDispBaseDTO.getTargetUnitType()){
// 调度给镇街综治中心，进入第1个任务节点-镇街综治中心待分派
CaseTask dfpCaseTask = new CaseTask();
dfpCaseTask.setId(utilsClient.getNewTimeId());
--
Gitblit v1.8.0