Merge remote-tracking branch 'origin/master'

xusd

2024-09-15 de9369d2c8056e2bb723247b0e877fe9d96f8def

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

@@ -34,6 +34,7 @@
import cn.huge.module.flow.service.FlowInfoService;
import cn.huge.module.mediate.constant.*;
import cn.huge.module.sys.constant.SyTimeEnum;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -644,6 +645,7 @@
                        if(frontPageListDTO.getCaseId().equals(unfold.getId())){
                            frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
                            frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
                            frontPageListDTO.setManager(unfold.getMediator());
                        }
                    }
                }
@@ -742,12 +744,31 @@
            caseAssistApplyQueryWrapper.eq("case_id", caseId);
            List<CaseAssistApply>caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
            List<SortUtilDTO> sortUtilDTOList = new ArrayList<>();

            String ids = new String();
            ids += caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.joining(","));
            ids += caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.joining(","));
            ids += caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.joining(","));
            ids += caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.joining(","));
            List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = new ArrayList<>();
            if(StringUtils.isNotBlank(ids)){
                Map terms = new HashMap();
                terms.put("mainId", caseId);
                terms.put("ownerIds", "," + ids + ",");
                fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms);
            }

            for(CaseReturn caseReturn: caseReturnList){
                SortUtilDTO sortUtilDTO = new SortUtilDTO();
                sortUtilDTO.setObject(caseReturn);
                sortUtilDTO.setDate(caseReturn.getCreateTime());
                sortUtilDTO.setType("回退申请");
                sortUtilDTOList.add(sortUtilDTO);
                for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
                    if(caseReturn.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
                        sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
                    }
                }
            }
            for(CaseAppear caseAppear: caseAppearList){
                SortUtilDTO sortUtilDTO = new SortUtilDTO();
@@ -755,6 +776,11 @@
                sortUtilDTO.setDate(caseAppear.getCreateTime());
                sortUtilDTO.setType("上报申请");
                sortUtilDTOList.add(sortUtilDTO);
                for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
                    if(caseAppear.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
                        sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
                    }
                }
            }
            for(CaseWindupApply caseWindupApply: caseWindupApplyList){
                SortUtilDTO sortUtilDTO = new SortUtilDTO();
@@ -762,6 +788,11 @@
                sortUtilDTO.setDate(caseWindupApply.getCreateTime());
                sortUtilDTO.setType("结案申请");
                sortUtilDTOList.add(sortUtilDTO);
                for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
                    if(caseWindupApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
                        sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
                    }
                }
            }
            for(CaseAssistApply caseAssistApply: caseAssistApplyList){
                SortUtilDTO sortUtilDTO = new SortUtilDTO();
@@ -769,6 +800,11 @@
                sortUtilDTO.setDate(caseAssistApply.getCreateTime());
                sortUtilDTO.setType("联合处置申请");
                sortUtilDTOList.add(sortUtilDTO);
                for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
                    if(caseAssistApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
                        sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
                    }
                }
            }
            sortUtilDTOList.sort(Comparator.comparing(SortUtilDTO::getDate));
            List<Object> resultList = new ArrayList<>();
@@ -777,8 +813,8 @@
            }
            return resultList;
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
            log.error("[CaseTaskService.listMyApplyRecord]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.listMyApplyRecord", e);
        }
    }