forked from gzzfw/backEnd/gz-dyh

wangwh
2024-09-10 f0ee71145111bc6ef12c1990fd44d02e688ca31f
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -36,6 +36,7 @@
import cn.huge.module.flow.service.FlowInfoService;
import cn.huge.module.mediate.constant.*;
import cn.huge.module.sys.constant.SyTimeEnum;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Maps;
@@ -556,14 +557,14 @@
                caseIdList.add(frontPageListDTO.getCaseId());
            }
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>();
                assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1)
                        .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
                List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper);
                for(CaseAssistApply caseAssistApply: caseAssistApplyList){
                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(caseAssistApply.getCaseId())){
                            frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName());
                        if(frontPageListDTO.getCaseId().equals(unfold.getId())){
                            frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
                            frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
                        }
                    }
                }
@@ -590,14 +591,14 @@
            List<String> caseIdList = new ArrayList<>();
            caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>();
                assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1)
                        .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
                List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper);
                for(CaseAssistApply caseAssistApply: caseAssistApplyList){
                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(caseAssistApply.getCaseId())){
                            frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName());
                        if(frontPageListDTO.getCaseId().equals(unfold.getId())){
                            frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId());
                            frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
                        }
                    }
                }
@@ -675,6 +676,7 @@
            BeanUtils.copyProperties(caseInfo, dispCaseBaseDTO);
            dispCaseBaseDTO.setCaseId(caseInfo.getId());
            CaseDispBaseDTO caseDispBaseDTO = dispClient.sysDisp(dispCaseBaseDTO);
            log.info(JSON.toJSONString(caseDispBaseDTO));
            // 目前平台只能调度给组织
            if (DispBaseConstsEnum.TARGET_TYPE_1.getIndex().equals(caseDispBaseDTO.getTargetType())) {
                // 目前平台只做镇街、村居级别的调度,
@@ -1338,7 +1340,7 @@
            caseWindupApply.setAuditUserName(loginUser.getTrueName());
            caseWindupApply.setAuditTime(nowDate);
            caseWindupApply.setUpdateTime(nowDate);
            caseWindupApplyService.saveCaseWindupApply(caseWindupApply);
            caseWindupApplyService.updateCaseWindupApply(caseWindupApply);
            // 查询结案审核任务
            CaseTask jashCaseTask = mapper.selectById(caseWindupApply.getCaseTaskId());
            // 审核通过,