1、自行受理跳转bug修复 2、联合处置流程优化

liyj

2024-09-15 3ce77531a4e13d749d58fea1a13695a80fbb9516

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

@@ -3,13 +3,24 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
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.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;
import cn.huge.module.flow.domain.po.FlowNode;
import cn.huge.module.flow.service.FlowInfoService;
import cn.huge.module.mediate.constant.*;
import cn.huge.module.sys.dto.FileIdInfoBaseDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -46,12 +57,16 @@

    @Autowired
    private UtilsClientImpl utilsClient;

    @Autowired
    private CustClientImpl custClient;

    @Autowired
    private SysClientImpl sysClient;
    @Autowired
    private FlowInfoService flowInfoService;
    @Autowired
    private CaseTaskService caseTaskService;
    @Autowired
    private CaseInfoUnfoldService caseInfoUnfoldService;

    /**
    * 更新对象
@@ -152,21 +167,20 @@
            // 获取当前登录用户
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            Date now = DateUtils.getNowDate();

            // 新增联合处置申请
            caseAssistApply.setApplyUnitId(loginUser.getUnitId());
            caseAssistApply.setApplyUnitName(loginUser.getUnitName());
            caseAssistApply.setApplyUserId(loginUser.getId());
            caseAssistApply.setApplyUserName(loginUser.getTrueName());
            caseAssistApply.setApplyStatus(0);
            caseAssistApply.setDeleteStatus(0);
            caseAssistApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_0);
            caseAssistApply.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
            caseAssistApply.setApplyTime(now);
            caseAssistApply.setCreateTime(now);
            caseAssistApply.setUpdateTime(now);
            //todo 添加任务
            // 上级综治中心审核
            CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
            caseAssistApply.setAuditUnitId(ctUnitDTO.getId());
            caseAssistApply.setAuditUnitName(ctUnitDTO.getUnitName());

            mapper.insert(caseAssistApply);
        }catch (Exception e){
            log.error("[CaseAssistApplyService.addCaseAssistApply]调用失败，异常信息："+e, e);
@@ -175,7 +189,7 @@
    }

    /**
     * 审核联合处置申请
     * 审核联合处置审核
     * @param caseAssistApply 实体对象
     */
    public void reviewCaseAssistApply(CaseAssistApply caseAssistApply, String userId){
@@ -183,15 +197,57 @@
            // 获取当前登录用户
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            Date now = DateUtils.getNowDate();

            caseAssistApply.setApplyStatus(1);
            caseAssistApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_1);
            caseAssistApply.setAuditUserId(loginUser.getId());
            caseAssistApply.setAuditUserName(loginUser.getTrueName());
            caseAssistApply.setAuditTime(now);
            caseAssistApply.setUpdateTime(now);
            //todo 修改任务状态

            mapper.updateCaseAssistApply(caseAssistApply);
            // 审核通过，就启动联合处置工作流
            if (AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex().equals(caseAssistApply.getAuditResult())) {
                String[] unitIds = caseAssistApply.getApplyAssistUnitId().split(BaseConsts.COMMA);
                for (String unitId: unitIds) {
                    // 启动联合处置工作流
                    FlowNode firstFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, caseAssistApply.getCaseId());
                    // 创建配合部门待受理任务
                    CaseTask dslCaseTask = new CaseTask();
                    dslCaseTask.setId(utilsClient.getNewTimeId());
                    dslCaseTask.setCaseId(caseAssistApply.getCaseId());
                    dslCaseTask.setFlowableId(firstFlowNode.getFlowableId());
                    dslCaseTask.setProcessInstanceId(firstFlowNode.getProcessInstanceId());
                    dslCaseTask.setProcessTaskId(firstFlowNode.getProcessTaskId());
                    dslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
                    dslCaseTask.setNodeType(firstFlowNode.getNodeType());
                    dslCaseTask.setNodeId(firstFlowNode.getNodeId());
                    dslCaseTask.setNodeName(firstFlowNode.getNodeName());
                    dslCaseTask.setFlowId(firstFlowNode.getFlowId());
                    dslCaseTask.setNodeShowName(firstFlowNode.getNodeShowName());
                    dslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
                    // 通过调度的，任务候选执行者类型是上一步骤选择
                    dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
                    CtUnitDTO ctUnitDTO = custClient.getUnitById(unitId);
                    dslCaseTask.setCandeUnitId(ctUnitDTO.getId());
                    dslCaseTask.setCandeUnitName(ctUnitDTO.getUnitName());
                    // 需要签收
                    dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
                    dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
                    // 任务处理时限
                    if (firstFlowNode.getExpire() != 0) {
                        dslCaseTask.setExpireTime(DateUtils.addDay(now, firstFlowNode.getExpire()));
                    }
                    dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
                    dslCaseTask.setCustId(caseAssistApply.getCustId());
                    dslCaseTask.setCreateTime(now);
                    dslCaseTask.setUpdateTime(now);
                    caseTaskService.save(dslCaseTask);
                }
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
                caseInfoUnfoldPO.setId(caseAssistApply.getCaseId());
                caseInfoUnfoldPO.setAssistUnitId(caseAssistApply.getApplyAssistUnitId());
                caseInfoUnfoldPO.setAssistUnitName(caseAssistApply.getApplyAssistUnitName());
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
            }
        }catch (Exception e){
            log.error("[CaseAssistApplyService.reviewCaseAssistApply]调用失败，异常信息："+e, e);
            throw new ServiceException("CaseAssistApplyService.reviewCaseAssistApply", e);
@@ -204,17 +260,50 @@
     * @return long
     */
    public CaseAssistApply caseAssistApplyByCaseId(String caseId){
        QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
        caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0)
                .orderByDesc("create_time");
        CaseAssistApply caseAssistApply = mapper.selectOne(caseAssistApplyQueryWrapper);
        Map<String, Object> terms = new HashMap<>();
        terms.put("mainId", caseId);
        terms.put("ownerIds", "'" + caseAssistApply.getId() + "'");
        List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
        if(CollectionUtils.isNotEmpty(fileIdInfoBaseDTOList)){
            caseAssistApply.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
        try {
            QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
            caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0)
                    .orderByDesc("create_time");
            CaseAssistApply caseAssistApply = mapper.selectOne(caseAssistApplyQueryWrapper);
            Map<String, Object> terms = new HashMap<>();
            terms.put("mainId", caseId);
            terms.put("ownerIds", "'" + caseAssistApply.getId() + "'");
            List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
            if (CollectionUtils.isNotEmpty(fileIdInfoBaseDTOList)) {
                caseAssistApply.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
            }
            return caseAssistApply;
        }catch(Exception e ){
            log.error("[CaseAssistApplyService.caseAssistApplyByCaseId]调用失败，异常信息："+e, e);
            throw new ServiceException("CaseAssistApplyService.caseAssistApplyByCaseId", e);
        }
        return caseAssistApply;
    }

    /**
     * 首页查询
     * @param auditUnitId 审核组织编号
     * @return long
     */
    public long countAssistReview(String auditUnitId){
        return mapper.countAssistReview(auditUnitId);
    }

    /**
     * 首页-待审核条件统计
     * @param terms 条件
     * @return long
     */
    public long countMyTaskAssistReview(Map<String, Object> terms){
        return mapper.countMyTaskAssistReview(terms);
    }

    /**
     * 按条件查询
     * @param page 分页对象
     * @param terms 条件
     * @return List
     */
    public List<FrontPageListDTO> pageMyTaskAssistReview(PageRequest page, Map<String, Object> terms){
        return mapper.pageMyTaskAssistReview(page, terms);
    }
}