Merge branch 'gzdyh_prod'

xusd

5 days ago e9de6064cc94d6bc63685c5e62046ff810b96dab

 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);
//                        }
                    }
                }
                //司法确认
@@ -831,7 +846,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())
@@ -1148,6 +1163,45 @@
            log.error("[CaseTaskService.getCountList]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.getCountList", e);
        }
    }
    /**
     * 首页-查询全部待办任务
     *
     * @param page  分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListAllDTO> pageMyTaskAll(PageRequest page, Map<String, Object> terms) {
        try {
            long total = mapper.countMyTaskAll(terms);
            List<FrontPageListAllDTO> frontPageListFPDTOList = mapper.pageMyTaskAll(page, terms);
            return new PageImpl<FrontPageListAllDTO>(frontPageListFPDTOList, page, total);
        } catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskAll]调用失败，异常信息：" + e, e);
            throw new ServiceException("pageMyTaskAll.pageMyTaskFp", e);
        }

    }

    /**
     * 已办事项-数量
     * @param terms 条件
     */
    public CaseYbCountDTO countYbTaskAll(Map<String, Object> terms) {
        CaseYbCountDTO caseYbCountDTO = new CaseYbCountDTO();
        long ybDispatch = mapper.countYbDispatch(terms);
        long ybAccept = mapper.countYbAccept(terms);
        long ybClosed = mapper.countYbClosed(terms);
        long ybAudit = mapper.countYbAudit(terms);
        long ybSupervise = mapper.countYbSupervise(terms);
        caseYbCountDTO.setYbDispatch(ybDispatch);
        caseYbCountDTO.setYbAccept(ybAccept);
        caseYbCountDTO.setYbClosed(ybClosed);
        caseYbCountDTO.setYbAudit(ybAudit);
        caseYbCountDTO.setYbSupervise(ybSupervise);
        caseYbCountDTO.setYbMerge(0L);
        caseYbCountDTO.setAllYbTask(ybDispatch+ybAccept+ybClosed+ybAudit+ybSupervise);
        return caseYbCountDTO;
    }

    /**
@@ -4120,7 +4174,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())) {