From dd002e322c572271969fa0578aba2cef42d9d8a5 Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Wed, 09 Jul 2025 17:29:37 +0800
Subject: [PATCH] fix:不予受理逻辑调整

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 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 c68faee..6cd8b39 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
@@ -427,7 +427,25 @@
                             buttonList.add(sb);
                         }
                         if (bysl.getName().equals("不予受理")) {
-                            buttonList.add(bysl);
+                            //如果是镇街综治中心,并且案子是由区下发的,则不显示
+                            if (UserBaseConsts.UNIT_GRADE_3 == ctUnitDTO.getUnitGrade()) {
+                                String id = caseInfo.getId();
+                                Map<String, Object> terms = new HashMap<>();
+                                terms.put("caseId", id);
+                                List<CaseTask> caseTasks = mapper.listTerms(terms);
+                                boolean isQuSend = false;
+                                for (CaseTask item : caseTasks) {
+                                    if (item.getNodeId() != null && item.getNodeId().equals("QJ_DFP")) {
+                                        isQuSend = true;
+                                        break;
+                                    }
+                                }
+                                if (!isQuSend) {
+                                    buttonList.add(bysl);
+                                }
+                            } else {
+                                buttonList.add(bysl);
+                            }
                         } else {
                             if (UserBaseConsts.UNIT_GRADE_2 == ctUnitDTO.getUnitGrade()) {
                                 buttonList.add(bysl);
@@ -666,11 +684,11 @@
                     lfdj.setNodeShowName("自行排查");
                     lfdj.setHandleUserName(caseInfo.getInputUserName());
                     lfdj.setHandleUnitName(caseInfo.getInputUnitName());
-                    if(CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getIndex().equals(caseInfo.getCanalSecond())){
+                    if (CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getIndex().equals(caseInfo.getCanalSecond())) {
                         lfdj.setHandleUserName("系统自动获取");
                         lfdj.setHandleUnitName(caseInfo.getCanalSecondName());
                     }
-                    if(CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getIndex().equals(caseInfo.getCanalSecond())){
+                    if (CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getIndex().equals(caseInfo.getCanalSecond())) {
                         lfdj.setHandleUserName("系统自动获取");
                         lfdj.setHandleUnitName(caseInfo.getCanalSecondName());
                     }
@@ -2297,6 +2315,12 @@
             // 受理后的节点任务,未读
             blfkCaseTask.setReadStatus(CaseTaskConsts.READ_STATUS_0);
             blfkCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
+
+            //  判断是否非警务,如果是则需要重新计算,不是就走原先逻辑
+            CaseInfo caseInfo = caseInfoService.getById(dslCaseTask.getCaseId());
+            if (caseInfo.getCanalSecond().equals(CaseBaseConstsEnum.CASE_CANAL_SECOND_1.getIndex())) {
+                newFlowNode.setExpire(3);
+            }
             // 任务处理时限
             if (newFlowNode.getExpire() != 0) {
                 blfkCaseTask.setExpireTime(syHolidayService.getExpiryDay(nowDate, newFlowNode.getExpire()));
@@ -4135,9 +4159,9 @@
             gridToDoBacthVo.setYzyContent("");
             gridToDoBacthVo.setObjTag("");
             gridToDoBacthVo.setMobile("18607214221");
-            if(StringUtils.isNotEmpty(caseInfo.getCanalSecond())&&caseInfo.getCanalSecond().equals("22_00003-7")){
+            if (StringUtils.isNotEmpty(caseInfo.getCanalSecond()) && caseInfo.getCanalSecond().equals("22_00003-7")) {
                 gridToDoBacthVo.setTodoType(GridEnum.GRID_TODO_TYPE_6.getIndex());
-            }else {
+            } else {
                 gridToDoBacthVo.setTodoType(GridEnum.GRID_TODO_TYPE_5.getIndex());
             }
 

--
Gitblit v1.8.0