From b60ecf40efa981d8731497d6eeb9b8b3005ecf1d Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Thu, 10 Oct 2024 10:22:19 +0800
Subject: [PATCH] 1、自行排查的来访方式显示错误修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 7b6d70e..eba423c 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
@@ -317,8 +317,11 @@
sl.setName("自行受理");
buttonList.add(sl);
buttonList.add(jb);
- buttonList.add(sb);
buttonList.add(bysl);
+ CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
+ if (UserBaseConsts.UNIT_GRADE_1 != ctUnitDTO.getUnitGrade()) {
+ buttonList.add(sb);
+ }
// 额外单独给详情跳转查看
daxx.setName("详情");
@@ -431,10 +434,18 @@
}
}
}else {
- daxx.setName("详情");
- tabList.add(daxx);
- tabList.add(lcdb);
- tabList.add(sqjl);
+ // 是否是联合处置审核
+ CaseAssistApply caseAssistApply = caseAssistApplyService.getById(caseTaskId);
+ if (ObjectUtils.isNotEmpty(caseAssistApply)){
+ tabList.add(sxxq);
+ tabList.add(lhczsh);
+ tabList.add(sqjl);
+ }else {
+ daxx.setName("详情");
+ tabList.add(daxx);
+ tabList.add(lcdb);
+ tabList.add(sqjl);
+ }
}
// 封装数据
TabButtonDTO tabButtonDTO = new TabButtonDTO();
@@ -2044,6 +2055,15 @@
caseInfoUnfoldPO.setUpdateTime(nowDate);
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
}
+ // 查询联合处置申请单，全部结束申请单
+ QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
+ caseAssistApplyQueryWrapper.eq("case_id", jasqCaseTask.getCaseId()).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_0);
+ List<CaseAssistApply> caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
+ for (CaseAssistApply caseAssistApply: caseAssistApplyList){
+ caseAssistApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_2);
+ caseAssistApply.setUpdateTime(nowDate);
+ caseAssistApplyService.updateCaseAssistApply(caseAssistApply);
+ }
// 查询配合部门的任务，全部结束流程
List<CaseTask> assistCaseTaskList = this.listAssistTasking(jasqCaseTask.getCaseId());
for (CaseTask assistCaseTask: assistCaseTaskList){
@@ -2718,8 +2738,9 @@
dfphCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
// 受理任务，任务候选执行者类型是上一步骤选择
dfphCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
- dfphCaseTask.setCandeUnitId(caseAppear.getAppearUnitId());
- dfphCaseTask.setCandeUnitName(caseAppear.getAppearUnitName());
+ CaseAppear caseAppearBO = caseAppearService.getById(caseAppear.getId());
+ dfphCaseTask.setCandeUnitId(caseAppearBO.getAppearUnitId());
+ dfphCaseTask.setCandeUnitName(caseAppearBO.getAppearUnitName());
// 受理后的任务，不需要签收
dfphCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
--
Gitblit v1.8.0