整改： 1、工作台-办理中列表 2、工作台-结案申请/已结案列表 3、事项状态，办理中改为化解中

liyj

2024-09-21 230c051d5afafaa3957f5f2c471f16116103e16c

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

@@ -216,9 +216,9 @@
            TabButtonInfoDTO sxbl = new TabButtonInfoDTO();
            sxbl.setId("sxbl");
            sxbl.setName("事项办理");
//            TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
//            sqjl.setId("sqjl");
//            sqjl.setName("申请记录");
            TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
            sqjl.setId("sqjl");
            sqjl.setName("申请记录");
            TabButtonInfoDTO htsh = new TabButtonInfoDTO();
            htsh.setId("htsh");
            htsh.setName("回退审核");
@@ -266,6 +266,9 @@
            TabButtonInfoDTO sb = new TabButtonInfoDTO();
            sb.setId("sb");
            sb.setName("上报");
            TabButtonInfoDTO bysl = new TabButtonInfoDTO();
            bysl.setId("bysl");
            bysl.setName("不予受理");
            // 根据流程显示tab
            List<TabButtonInfoDTO> tabList = new LinkedList<>();
            // 根据流程显示button
@@ -273,106 +276,136 @@
            if (ObjectUtils.isNotEmpty(caseTask)) {
                if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);

                    buttonList.add(zxsl);
                    buttonList.add(jb);
                    buttonList.add(sb);
                    buttonList.add(bysl);
                }
                if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);

                    buttonList.add(sl);
                    buttonList.add(ht);
                    buttonList.add(bysl);
                }
                if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                    tabList.add(htsh);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                    tabList.add(sbsh);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);

                    buttonList.add(zxsl);
                    buttonList.add(jb);
                    buttonList.add(sb);
                    buttonList.add(bysl);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);

                    buttonList.add(sl);
                    buttonList.add(ht);
                    buttonList.add(bysl);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                    tabList.add(htsh);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                    tabList.add(sbsh);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);

                    buttonList.add(zxsl);
                    buttonList.add(jb);
                    buttonList.add(bysl);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);

                    buttonList.add(sl);
                    buttonList.add(ht);
                    buttonList.add(bysl);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                    tabList.add(htsh);
                }
                if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(sxxq);
                    tabList.add(sxbl);
//                    tabList.add(sqjl);
                    if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
                        tabList.add(sxxq);
                        tabList.add(sxbl);
                        tabList.add(lcdb);
                        tabList.add(sqjl);

                    buttonList.add(tjbljl);
                    buttonList.add(lhczsq);
                    buttonList.add(jasq);
                        buttonList.add(tjbljl);
                        buttonList.add(lhczsq);
                        buttonList.add(jasq);
                        buttonList.add(db);
                    }else {
                        tabList.add(sxxq);
                        tabList.add(sxbl);
                        tabList.add(lcdb);
                        tabList.add(sqjl);

                        buttonList.add(tjbljl);
                    }
                }
                if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(sxxq);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                    tabList.add(jash);
                }
                if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
                    daxx.setName("信息");
                    tabList.add(daxx);
                    tabList.add(lcdb);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                }
                if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(daxx);
                    tabList.add(lcdb);
//                    tabList.add(sqjl);
                    tabList.add(sqjl);
                }
                if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
                    tabList.add(sqjl);

                    buttonList.add(sl);
                    buttonList.add(ht);
                }
                if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
                    tabList.add(sqjl);
                    tabList.add(htsh);
                }
            }else {
                tabList.add(sxxq);
//                tabList.add(sqjl);
                tabList.add(sqjl);
                tabList.add(lhczsh);
            }
            // 封装数据
@@ -425,9 +458,9 @@
                        if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
                            WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
                            slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                            slWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
                            slWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
                            slWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
                            slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                            slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
                            slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
                            slWebCaseFlowDTO.setHandleNotes("已签收");
                            slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
                            slWebCaseFlowDTO.setStatus(caseTask.getStatus());
@@ -503,6 +536,24 @@
                    handleCaseFlowList.add(webCaseFlowDTO);
                }else {
                    // 进行中的节点
                    // 待受理并已签收的正常任务节点，需要加多一个签收节点
                    if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
                        if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
                            WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
                            slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                            slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                            slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
                            slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
                            slWebCaseFlowDTO.setHandleNotes("已签收");
                            slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
                            slWebCaseFlowDTO.setStatus(CaseTaskConsts.TASK_STATUS_2);
                            handleCaseFlowList.add(slWebCaseFlowDTO);
                        }
                    }
                    // 正常节点
                    WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
                    webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                    webCaseFlowDTO.setStatus(caseTask.getStatus());
@@ -510,7 +561,7 @@
                    if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
                        webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
                    }else{
                        webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                        webCaseFlowDTO.setProcessName(caseTask.getCandeUnitName());
                    }
                    handleCaseFlowList.add(webCaseFlowDTO);
                }
@@ -518,32 +569,140 @@
            result.put("handleCaseFlowList", handleCaseFlowList);

            // 查询配合组织流程
            CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
            if (StringUtils.isNotEmpty(caseInfoUnfold.getAssistUnitId())){
            List<CaseAssistInfo> caseAssistInfoList = caseAssistInfoService.listByCaseId(caseId);
            if (CollectionUtils.isNotEmpty(caseAssistInfoList)){
                LinkedList<WebAssistCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
                String[] unitIdList = caseInfoUnfold.getAssistUnitId().split(BaseConsts.COMMA);
                String[] unitNameList = caseInfoUnfold.getAssistUnitName().split(BaseConsts.COMMA);
                for (int i=0; i<unitIdList.length; i++){
                    String unitId = unitIdList[i];
                    String unitName = unitNameList[i];
                for (CaseAssistInfo caseAssistInfo: caseAssistInfoList){
                    WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
                    webAssistCaseFlowDTO.setUnitId(unitId);
                    webAssistCaseFlowDTO.setUnitName(unitName);
                    i ++;
                    webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId());
                    if (CaseTaskConsts.ASSIST_STATUS_0 == caseAssistInfo.getAssistStatus()) {
                        webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName());
                    }else {
                        webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName()+"（已回退）");
                    }
                    LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
                    caseTaskQueryWrapper.clear();
                    caseTaskQueryWrapper.eq("case_id", caseId).eq("cande_unit_id", unitId)
                            .eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).orderByDesc("create_time");
                    caseTaskQueryWrapper.eq("case_id", caseId).eq("cande_unit_id", caseAssistInfo.getAssistUnitId())
                            .eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).orderByAsc("id");
                    List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
                    for (CaseTask caseTask: assistCaseTaskList){
                        WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
                        webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                        webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                        webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
                        webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
                        webCaseFlowDTO.setTaskType(caseTask.getTaskType());
                        webCaseFlowDTO.setStatus(caseTask.getStatus());
                        caseFlowList.add(webCaseFlowDTO);
                        // 已结束节点
                        if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
                            // 待受理并已签收的正常任务节点，需要加多一个签收节点
                            if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
                                if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
                                    WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
                                    slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                                    slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                                    slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
                                    slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
                                    slWebCaseFlowDTO.setHandleNotes("已签收");
                                    slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
                                    slWebCaseFlowDTO.setStatus(caseTask.getStatus());
                                    caseFlowList.add(slWebCaseFlowDTO);
                                }
                            }
                            // 普通节点
                            WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
                            webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                            webCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
                            webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
                            webCaseFlowDTO.setStatus(caseTask.getStatus());
                            webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
                            webCaseFlowDTO.setTaskType(caseTask.getTaskType());
                            // 回退申请节点
                            if(CaseTaskConsts.TASK_TYPE_2 == caseTask.getTaskType()){
                                webCaseFlowDTO.setNodeShowName("事件回退");
                                CaseReturn caseReturn = caseReturnService.getNewByCaseId(caseId, caseTask.getCaseTaskType());
                                if (StringUtils.isNotEmpty(caseReturn.getReturnContent())) {
                                    webCaseFlowDTO.setHandleNotes("回退理由：" + caseReturn.getReturnContent());
                                }else {
                                    webCaseFlowDTO.setHandleNotes("回退理由：-");

                                }
                            }
                            // 上报申请节点
                            if(CaseTaskConsts.TASK_TYPE_3 == caseTask.getTaskType()){
                                webCaseFlowDTO.setNodeShowName("事件上报");
                                CaseAppear caseAppear = caseAppearService.getNewByCaseId(caseId);
                                if (StringUtils.isNotEmpty(caseAppear.getAppearContent())) {
                                    webCaseFlowDTO.setHandleNotes("上报理由：" + caseAppear.getAppearContent());
                                }else {
                                    webCaseFlowDTO.setHandleNotes("上报意见：-" );
                                }
                            }
                            // 当事人评价节点，特殊处理
                            if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
                                webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                                webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
                            }else{
                                webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
                            }
                            // 审核节点要判断通过/不通过
                            if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex())){
                                // 处理不通过，任务类型就是回退
                                if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
                                    webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
                                    webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
                                    webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
                                }else{
                                    // 处理通过
                                    webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
                                    webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
                                }
                                // 临时加上
                                webCaseFlowDTO.setHandleNotes("审核结果："+webCaseFlowDTO.getAuditResultName());
                            }
                            // 结案申请，需要展示化解结果
                            if (FlowNodeEnum.FLOW_NODE_JASQ.getIndex().equals(caseTask.getNodeId())){
                                CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseTask.getCaseId());
                                if (ObjectUtils.isNotEmpty(caseInfoUnfold)){
                                    webCaseFlowDTO.setMediResult(caseInfoUnfold.getMediResult());
                                    webCaseFlowDTO.setMediResultName(caseInfoUnfold.getMediResultName());
                                    // 临时加上
                                    webCaseFlowDTO.setHandleNotes("化解结果："+webCaseFlowDTO.getMediResultName());
                                }
                            }
                            caseFlowList.add(webCaseFlowDTO);
                        }else {
                            // 进行中的节点
                            // 待受理并已签收的正常任务节点，需要加多一个签收节点
                            if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
                                    || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
                                if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
                                    WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
                                    slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                                    slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                                    slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
                                    slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
                                    slWebCaseFlowDTO.setHandleNotes("已签收");
                                    slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
                                    slWebCaseFlowDTO.setStatus(CaseTaskConsts.TASK_STATUS_2);
                                    caseFlowList.add(slWebCaseFlowDTO);
                                }
                            }
                            // 正常节点
                            WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
                            webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                            webCaseFlowDTO.setStatus(caseTask.getStatus());
                            // 当事人评价节点，特殊处理
                            if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
                                webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
                            }else{
                                webCaseFlowDTO.setProcessName(caseTask.getCandeUnitName());
                            }
                            caseFlowList.add(webCaseFlowDTO);
                        }
                    }
                    webAssistCaseFlowDTO.setCaseFlowList(caseFlowList);
                    assistCaseFlowList.add(webAssistCaseFlowDTO);
@@ -584,16 +743,20 @@
    }

    /**
     * 首页-查询待办任务-受分派
     * 首页-查询待办任务-待/已分派
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
    public Page<FrontPageListFPDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskFp(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskFp(page, terms);
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
            List<FrontPageListFPDTO> frontPageListFPDTOList = mapper.pageMyTaskFp(page, terms);
            for (FrontPageListFPDTO frontPageListFPDTO: frontPageListFPDTOList){
                // 查询督办次数

            }
            return new PageImpl<FrontPageListFPDTO>(frontPageListFPDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskFp]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskFp", e);
@@ -602,16 +765,16 @@
    }

    /**
     * 首页-查询待办任务-受签收
     * 首页-查询待办任务-待/已签收
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
    public Page<FrontPageListQSDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskQs(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
            List<FrontPageListQSDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
            return new PageImpl<FrontPageListQSDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
@@ -619,19 +782,19 @@
    }

    /**
     * 首页-查询待办任务-受待理
     * 首页-查询待办任务-待/已受理
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
    public Page<FrontPageListSLDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskSl(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
            List<FrontPageListSLDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
            return new PageImpl<FrontPageListSLDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
            log.error("[CaseTaskService.pageMyTaskSl]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskSl", e);
        }
    }

@@ -641,39 +804,22 @@
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
    public Page<FrontPageListBLZDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskProcessing(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskProcessing(page, terms);
            List<String> caseIdList = new ArrayList<>();
            long total = mapper.countMyTaskBlz(terms);
            List<FrontPageListBLZDTO> frontPageListBLZDTOList = mapper.pageMyTaskBlz(page, terms);
            Date now = DateUtils.getNowDate();
            for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                long milliseconds1 = frontPageListDTO.getTurnaroundTime().getTime();
            for(FrontPageListBLZDTO frontPageListBLZDTO: frontPageListBLZDTOList){
                long milliseconds1 = frontPageListBLZDTO.getTurnaroundTime().getTime();
                long milliseconds2 = now.getTime();
                long diff = milliseconds2 - milliseconds1;
                long daysBetween = diff / (24 * 60 * 60 * 1000);
                frontPageListDTO.setProcessingDays(daysBetween);
                caseIdList.add(frontPageListDTO.getCaseId());
                frontPageListBLZDTO.setProcessingDays(daysBetween);
            }
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
                unfoldQueryWrapper.in("id", caseIdList);
                List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
                for(CaseInfoUnfold unfold: unfoldList){
                    for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                        if(frontPageListDTO.getCaseId().equals(unfold.getId())){
                            frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
                            frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
                            frontPageListDTO.setManager(unfold.getMediator());
                        }
                    }
                }
            }

            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
            return new PageImpl<FrontPageListBLZDTO>(frontPageListBLZDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
            log.error("[CaseTaskService.pageMyTaskBlz]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskBlz", e);
        }
    }

@@ -683,30 +829,14 @@
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
    public Page<FrontPageListJADTO> pageMyTaskJa(PageRequest page, Map<String, Object> terms){
        try {
            long total = caseWindupApplyService.countMySubmitApplyReview(terms);
            List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyService.listMySubmitApplyReview(page, terms);

            List<String> caseIdList = new ArrayList<>();
            caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
                unfoldQueryWrapper.in("id", caseIdList);
                List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
                for(CaseInfoUnfold unfold: unfoldList){
                    for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                        if(frontPageListDTO.getCaseId().equals(unfold.getId())){
                            frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
                            frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
                        }
                    }
                }
            }
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
            long total = caseWindupApplyService.countMyTaskJa(terms);
            List<FrontPageListJADTO> frontPageListJADTOList = caseWindupApplyService.listMyTaskJa(page, terms);
            return new PageImpl<FrontPageListJADTO>(frontPageListJADTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
            log.error("[CaseTaskService.pageMyTaskJa]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskJa", e);
        }
    }

@@ -733,6 +863,26 @@
                total = caseAssistApplyService.countMyTaskAssistReview(terms);
                frontPageListDTOList = caseAssistApplyService.pageMyTaskAssistReview(page, terms);
            }
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
        }
    }

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskShWSQD(PageRequest page, int type, Map<String, Object> terms){
        try {
            long total = 0;
            List<FrontPageListDTO> frontPageListDTOList = new ArrayList<>();
            total = mapper.countMyTaskShWSQD(terms);
            frontPageListDTOList = mapper.pageMyTaskShWSQD(page,terms);

            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
@@ -1239,7 +1389,7 @@
                // 拼接配合组织编号和名称
                String assistUnitId = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                        collect(Collectors.joining(BaseConsts.COMMA));
                String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitName).
                        collect(Collectors.joining(BaseConsts.COMMA));
                for (AssignAssistUnitDTO assignAssistUnitDTO: assignTaskDTO.getAssistUnitList()){
                    // 启动联合处置工作流
@@ -1407,8 +1557,13 @@
            dslCaseTaskPO.setUpdateTime(nowDate);
            mapper.updateCaseTask(dslCaseTaskPO);
            // 完成当前待受理工作流任务
            String operation = FlowableConsts.OPERATION_sl;
            // 配合部门受理条件改为通过
            if (CaseTaskConsts.CASE_TASK_TYPE_2 ==  dslCaseTask.getCaseTaskType()) {
                operation = FlowableConsts.OPERATION_forward;
            }
            FlowNode newFlowNode = flowInfoService.completeTask(dslCaseTask.getFlowableId(), dslCaseTask.getProcessTaskId(),
                    FlowableConsts.OPERATION_sl, userId);
                    operation, userId);
            // 新建办理反馈任务
            CaseTask blfkCaseTask = new CaseTask();
            blfkCaseTask.setId(utilsClient.getNewTimeId());
@@ -1710,7 +1865,6 @@
                caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
                caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
                caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
                caseInfoUnfoldPO.setCloseTime(nowDate);
                caseInfoUnfoldPO.setUpdateTime(nowDate);
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
            }
@@ -1824,12 +1978,6 @@
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
                caseInfoUnfoldPO.setId(dsrpjCaseTask.getCaseId());
                caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
                caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
                caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
                caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
                caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
                caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
                caseInfoUnfoldPO.setCloseTime(nowDate);
                caseInfoUnfoldPO.setUpdateTime(nowDate);
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
@@ -1892,18 +2040,6 @@
                caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
                caseInfoPO.setUpdateTime(nowDate);
                caseInfoService.updateCaseInfo(caseInfoPO);
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
                caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
                caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
                caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
                caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
                caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
                caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
                caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
                caseInfoUnfoldPO.setCloseTime(nowDate);
                caseInfoUnfoldPO.setUpdateTime(nowDate);
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
            }
        }catch (Exception e){
            log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
@@ -1970,9 +2106,9 @@
            htshCaseTask.setCaseTaskType(dslCaseTask.getCaseTaskType());
            // 受理任务，任务候选执行者类型是上一步骤选择
            htshCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
            CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
            htshCaseTask.setCandeUnitId(ctUnitDTO.getId());
            htshCaseTask.setCandeUnitName(ctUnitDTO.getUnitName());
//            CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
            htshCaseTask.setCandeUnitId(loginUser.getUnitId());
            htshCaseTask.setCandeUnitName(loginUser.getUnitName());
            // 受理后的任务，不需要签收
            htshCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
            // 任务处理时限
@@ -2074,6 +2210,15 @@
                    caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
                    caseInfoPO.setUpdateTime(nowDate);
                    caseInfoService.updateCaseInfo(caseInfoPO);
                }else {
                    // 更新联合处置信息
                    QueryWrapper<CaseAssistInfo> caseAssistInfoQueryWrapper = new QueryWrapper<>();
                    caseAssistInfoQueryWrapper.eq("case_id", htshCaseTask.getCaseId()).eq("assist_unit_id", htshCaseTask.getCandeUnitId()).eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0);
                    CaseAssistInfo caseAssistInfo = caseAssistInfoService.getOne(caseAssistInfoQueryWrapper);
                    if (ObjectUtils.isNotEmpty(caseAssistInfo)){
                        caseAssistInfo.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_1);
                        caseAssistInfoService.updateCaseAssistInfo(caseAssistInfo);
                    }
                }
            }else {
                // 审核不通过