fix:sql调整

xusd

2 days ago 067afa6387c75cc94d79ec9db9544a0b9db437a4

 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,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);
@@ -442,7 +460,7 @@
                            || 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);
@@ -524,7 +542,7 @@
                    // 联合处置-待受理
                    if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(sqjl);

                        tabList.add(lcdb);
                        buttonList.add(sl);
                        buttonList.add(ht);
                        buttonList.add(tabcl);
@@ -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());
                    }
@@ -884,9 +902,28 @@
                                lfdjAssist.setNodeShowName("来访登记");
                                lfdjAssist.setHandleUserName(caseInfo.getInputUserName());
                                lfdjAssist.setHandleUnitName(caseInfo.getInputUnitName());
                            } else {
                            }
                            if (CaseBaseConstsEnum.CASE_CANAL_2.getIndex().equals(caseInfo.getCanal())) {
                                lfdjAssist.setNodeShowName(caseInfo.getCanalName());
                                lfdjAssist.setHandleUnitName(caseInfo.getInputUserName() + "（当事人）");
                            }
                            if (CaseBaseConstsEnum.CASE_CANAL_3.getIndex().equals(caseInfo.getCanal())) {
                                lfdjAssist.setNodeShowName("自行排查");
                                lfdjAssist.setHandleUserName(caseInfo.getInputUserName());
                                lfdjAssist.setHandleUnitName(caseInfo.getInputUnitName());
                                if (CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getIndex().equals(caseInfo.getCanalSecond())) {
                                    lfdjAssist.setHandleUserName("系统自动获取");
                                    lfdjAssist.setHandleUnitName(caseInfo.getCanalSecondName());
                                }
                                if (CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getIndex().equals(caseInfo.getCanalSecond())) {
                                    lfdjAssist.setHandleUserName("系统自动获取");
                                    lfdjAssist.setHandleUnitName(caseInfo.getCanalSecondName());
                                }
                            }
                            if (CaseBaseConstsEnum.CASE_CANAL_4.getIndex().equals(caseInfo.getCanal())) {
                                lfdjAssist.setNodeShowName("协同推送");
                                lfdjAssist.setHandleUserName("系统自动获取");
                                lfdjAssist.setHandleUnitName(caseInfo.getCanalSecondName());
                            }
                            lfdjAssist.setTaskType(SHOW_TASK_TYPE_1);
                            lfdjAssist.setStatus(CaseTaskConsts.TASK_STATUS_2);
@@ -1049,7 +1086,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())
@@ -4141,9 +4178,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());
            }