From 70d169be4a5956921a1acaaba52ef3cfd5af9c55 Mon Sep 17 00:00:00 2001 From: xusd <330628789@qq.com> Date: Thu, 03 Jul 2025 15:35:16 +0800 Subject: [PATCH] fix:督办按钮增加 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 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 545b2c7..30f1953 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 @@ -411,6 +411,7 @@ caseTaskPO.setReadUserName(loginUser.getTrueName()); mapper.updateCaseTask(caseTaskPO); } + CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId); // 待分派节点 if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId()) || FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId()) @@ -421,7 +422,7 @@ buttonList.add(sl); buttonList.add(jb); buttonList.add(xqcl); - CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId); + if (UserBaseConsts.UNIT_GRADE_1 != ctUnitDTO.getUnitGrade()) { buttonList.add(sb); } @@ -432,6 +433,9 @@ buttonList.add(bysl); } } +// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){ +// buttonList.add(db); +// } } // 待受理节点 if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId()) @@ -442,6 +446,9 @@ buttonList.add(sl); buttonList.add(ht); buttonList.add(xqcl); +// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){ +// buttonList.add(db); +// } } // 回退审核节点 if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId()) @@ -474,7 +481,6 @@ buttonList.add(lhczsq); buttonList.add(jasq); buttonList.add(tabcl); - CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId); if (ObjectUtils.isNotEmpty(ctUnitDTO)) { if (GzRegionBaseEnum.AREA_7.getIndex().equals(ctUnitDTO.getArea())) { buttonList.add(yytj); @@ -488,6 +494,9 @@ buttonList.add(tjbljl); buttonList.add(tabcl); } +// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){ +// buttonList.add(db); +// } } // 结案审核节点 if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId()) @@ -498,6 +507,9 @@ tabList.add(jash); buttonList.add(tabcl); +// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){ +// buttonList.add(db); +// } } // 当事人评价节点 if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) { @@ -516,6 +528,9 @@ buttonList.add(sl); buttonList.add(ht); buttonList.add(tabcl); +// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){ +// buttonList.add(db); +// } } } //司法确认 @@ -651,6 +666,14 @@ lfdj.setNodeShowName("自行排查"); lfdj.setHandleUserName(caseInfo.getInputUserName()); lfdj.setHandleUnitName(caseInfo.getInputUnitName()); + 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())){ + lfdj.setHandleUserName("系统自动获取"); + lfdj.setHandleUnitName(caseInfo.getCanalSecondName()); + } } if (CaseBaseConstsEnum.CASE_CANAL_4.getIndex().equals(caseInfo.getCanal())) { lfdj.setNodeShowName("协同推送"); @@ -4112,7 +4135,12 @@ gridToDoBacthVo.setYzyContent(""); gridToDoBacthVo.setObjTag(""); gridToDoBacthVo.setMobile("18607214221"); - gridToDoBacthVo.setTodoType(GridEnum.GRID_TODO_TYPE_5.getIndex()); + if(StringUtils.isNotEmpty(caseInfo.getCanalSecond())&&caseInfo.getCanalSecond().equals("22_00003-7")){ + gridToDoBacthVo.setTodoType(GridEnum.GRID_TODO_TYPE_6.getIndex()); + }else { + gridToDoBacthVo.setTodoType(GridEnum.GRID_TODO_TYPE_5.getIndex()); + } + String title = ""; title += noticeTypeName; if (StringUtils.isNotBlank(caseInfo.getPlaintiffs())) { -- Gitblit v1.8.0