fix:流程节点信息优化

xusd

3 days ago 53340144631464ff5e336a5217300261c5399314

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java

@@ -417,7 +417,7 @@
                            || FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())
                            || FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(sqjl);

                        tabList.add(lcdb);
                        sl.setName("自行受理");
                        buttonList.add(sl);
                        buttonList.add(jb);
@@ -427,28 +427,46 @@
                            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);
                            }
                        }
                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
                            buttonList.add(db);
                        }
//                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
//                            buttonList.add(db);
//                        }
                    }
                    // 待受理节点
                    if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())
                            || FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())
                            || FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(sqjl);

                        tabList.add(lcdb);
                        buttonList.add(sl);
                        buttonList.add(ht);
                        buttonList.add(xqcl);
                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
                            buttonList.add(db);
                        }
//                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
//                            buttonList.add(db);
//                        }
                    }
                    // 回退审核节点
                    if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())
@@ -494,9 +512,9 @@
                            buttonList.add(tjbljl);
                            buttonList.add(tabcl);
                        }
                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
                            buttonList.add(db);
                        }
//                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
//                            buttonList.add(db);
//                        }
                    }
                    // 结案审核节点
                    if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())
@@ -507,9 +525,9 @@
                        tabList.add(jash);

                        buttonList.add(tabcl);
                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
                            buttonList.add(db);
                        }
//                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
//                            buttonList.add(db);
//                        }
                    }
                    // 当事人评价节点
                    if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
@@ -524,13 +542,13 @@
                    // 联合处置-待受理
                    if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(sqjl);

                        tabList.add(lcdb);
                        buttonList.add(sl);
                        buttonList.add(ht);
                        buttonList.add(tabcl);
                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
                            buttonList.add(db);
                        }
//                        if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
//                            buttonList.add(db);
//                        }
                    }
                }
                //司法确认
@@ -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());
                    }
@@ -846,7 +864,7 @@
                                || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex())
                                || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex())
                                || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex())) {
                            webCaseFlowDTO.setStatusName("待受理");
                            webCaseFlowDTO.setStatusName("待分派");
                        }
                        // 受理节点
                        if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())
@@ -1049,7 +1067,7 @@
                                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex())
                                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex())
                                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex())) {
                                        webCaseFlowDTO.setStatusName("待受理");
                                        webCaseFlowDTO.setStatusName("待分派");
                                    }
                                    // 受理节点
                                    if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())
@@ -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());
            }