Merge branch 'gzdyh_prod'

xusd

2 days ago c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380

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

@@ -651,6 +651,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("协同推送");
@@ -1141,6 +1149,45 @@
            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;
    }

    /**
     * 首页-查询待办任务-待/已分派