update

wangwh

2024-09-11 7d61aba7b69fe1462efa6fb2bc7a8012f35c2838

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

@@ -215,9 +215,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("回退审核");
@@ -402,7 +402,8 @@
                lfdj.setHandleUserName(caseInfo.getInputUserName());
            }else {
                lfdj.setNodeShowName(caseInfo.getCanalName());
                lfdj.setHandleUserName(caseInfo.getInputUserName()+"（当事人）");
                lfdj.setHandleUnitName(caseInfo.getInputUserName()+"（当事人）");
                lfdj.setHandleUserName(caseInfo.getInputUserName());
            }
            lfdj.setHandleUnitName(caseInfo.getInputUnitName());
            lfdj.setTaskType(CaseTaskConsts.TASK_TYPE_1);
@@ -411,13 +412,18 @@
            handleCaseFlowList.add(lfdj);
            // 查询承办组织任务
            QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
            caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByAsc("create_time");
            caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByAsc("id");
            List<CaseTask> handleCaseTaskList = mapper.selectList(caseTaskQueryWrapper);

            for (CaseTask caseTask: handleCaseTaskList){
                CaseFlowDTO caseFlowDTO = new CaseFlowDTO();
                if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
                    caseFlowDTO.setProcessName(caseInfo.getProcessName());
                    if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
                        caseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                        caseFlowDTO.setProcessName(caseTask.getNodeShowName());
                    }else{
                        caseFlowDTO.setProcessName(caseInfo.getProcessName());
                    }
                    caseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                    caseFlowDTO.setTaskType(caseTask.getTaskType());
                    caseFlowDTO.setStatus(caseTask.getStatus());