Merge remote-tracking branch 'origin/master'

xusd

2024-09-11 cb54981736771e19e6b954d8cb60f77576671fc5

Merge remote-tracking branch 'origin/master'

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml

@@ -349,7 +349,7 @@
        select
        count(case when node_id = 'ZJ_DFP' or  node_id = 'QJ_DFP' or  node_id = 'SJ_DFP' then id end) as waitDisp,
        count(case when sign_status = 1 then id end) as waitSign,
        count(case when (node_id = 'ZJ_DSL' or  node_id = 'QJ_DSL' or  node_id = 'SJ_DSL') and t1.sign_status != 1 then id end) as waitAccept,
        count(case when (node_id = 'ZJ_DSL' or  node_id = 'QJ_DSL' or  node_id = 'SJ_DSL') and sign_status != 1 then id end) as waitAccept,
        count(case when node_id = 'BLFK' then id end) as Processing
        from
        <include refid="table-name" />

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

@@ -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());