Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

liyj

2024-09-22 24d3def5fd8dc526ce9439449d2725b529e394f2

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

@@ -5,16 +5,12 @@
import cn.huge.base.common.utils.IdUtils;
import cn.huge.module.cases.consts.CaseTaskConsts;
import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cases.domain.po.CaseTask;
import cn.huge.module.cases.domain.po.*;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseAssistApplyMapper;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.cust.constant.UserBaseConsts;
import cn.huge.module.cust.dto.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.flow.consts.FlowableConsts;
@@ -37,7 +33,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @title: 联合处置申请信息表业务逻辑处理
@@ -67,6 +62,8 @@
    private CaseTaskService caseTaskService;
    @Autowired
    private CaseInfoUnfoldService caseInfoUnfoldService;
    @Autowired
    private CaseAssistInfoService caseAssistInfoService;

    /**
    * 更新对象
@@ -209,8 +206,11 @@
            mapper.updateCaseAssistApply(caseAssistApplyPO);
            // 审核通过，就启动联合处置工作流
            if (AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex().equals(caseAssistApplyPO.getAuditResult())) {
                String[] unitIds = caseAssistApplyPO.getApplyAssistUnitId().split(BaseConsts.COMMA);
                for (String unitId: unitIds) {
                String[] unitIdList = caseAssistApplyPO.getApplyAssistUnitId().split(BaseConsts.COMMA);
                String[] unitNameList = caseAssistApplyPO.getApplyAssistUnitName().split(BaseConsts.COMMA);
                for (int i=0; i<unitIdList.length; i++){
                    String unitId = unitIdList[i];
                    String unitName = unitNameList[i];
                    // 启动联合处置工作流
                    FlowNode dfpFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, caseAssistApplyPO.getCaseId());
                    // 新建并完成配合部门待分派任务
@@ -229,8 +229,8 @@
                    dfpCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
                    // 通过调度的，任务候选执行者类型是上一步骤选择
                    dfpCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
                    dfpCaseTask.setCandeUnitId(loginUser.getUnitId());
                    dfpCaseTask.setCandeUnitName(loginUser.getUnitName());
                    dfpCaseTask.setCandeUnitId(unitId);
                    dfpCaseTask.setCandeUnitName(unitName);
                    // 不需要签收
                    dfpCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
                    dfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
@@ -283,6 +283,17 @@
                    dslCaseTask.setCreateTime(now);
                    dslCaseTask.setUpdateTime(now);
                    caseTaskService.save(dslCaseTask);
                    // 新增联合处置信息
                    CaseAssistInfo caseAssistInfoPO = new CaseAssistInfo();
                    caseAssistInfoPO.setId(utilsClient.getNewTimeId());
                    caseAssistInfoPO.setCaseId(dslCaseTask.getCaseId());
                    caseAssistInfoPO.setAssistUnitId(unitId);
                    caseAssistInfoPO.setAssistUnitName(unitName);
                    caseAssistInfoPO.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_0);
                    caseAssistInfoPO.setCustId(dslCaseTask.getCustId());
                    caseAssistInfoPO.setCreateTime(now);
                    caseAssistInfoPO.setUpdateTime(now);
                    caseAssistInfoService.save(caseAssistInfoPO);
                }
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
@@ -349,4 +360,5 @@
    public List<FrontPageListDTO> pageMyTaskAssistReview(PageRequest page, Map<String, Object> terms){
        return mapper.pageMyTaskAssistReview(page, terms);
    }

}