From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错,且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报,且点击上报后报错

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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 abfbbee..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("详情");
@@ -2052,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){
@@ -2726,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