1、配合部门流程优化

liyj

2024-10-15 decc1c12c646fe6bf5f596dedf1067e0861693c9

1、配合部门流程优化

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

@@ -48,10 +48,11 @@
    public static final int HANDLE_RESULT_5 = 5;

    /**
     * 配合状态，0：配合，1：回退
     * 配合状态，0：配合，1：回退，2：承办部门回退
     */
    public static final int ASSIST_STATUS_0 = 0;
    public static final int ASSIST_STATUS_1 = 1;
    public static final int ASSIST_STATUS_2 = 2;

    /**
     * 经办类型，1：承办组织，2：配合组织

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAssistInfoWebController.java

@@ -88,7 +88,7 @@
        if (StringUtils.isNotBlank(assistUserName)){
            terms.put("assistUserName", assistUserName);
        }
        // 配合状态，0：配合，1：回退
        // 配合状态，0：配合，1：回退，2：承办部门回退
        String assistStatus = request.getParameter("assistStatus");
        if (StringUtils.isNotBlank(assistStatus)){
            terms.put("assistStatus", assistStatus);

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseAssistInfo.java

@@ -81,7 +81,7 @@
    private String assistUserName;

    /**
    * 配合状态，0：配合，1：回退
    * 配合状态，0：配合，1：回退，2：承办部门回退
    */
    @TableField(value = "assist_status")
    private Integer assistStatus;

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

@@ -38,6 +38,7 @@
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Maps;
import org.apache.commons.collections.CollectionUtils;
@@ -282,6 +283,12 @@
            TabButtonInfoDTO bysl = new TabButtonInfoDTO();
            bysl.setId("bysl");
            bysl.setName("不予受理");
            TabButtonInfoDTO xqcl = new TabButtonInfoDTO();
            xqcl.setId("xqcl");
            xqcl.setName("处理");
            TabButtonInfoDTO tabcl = new TabButtonInfoDTO();
            tabcl.setId("tabcl");
            tabcl.setName("处理");

            // 根据流程显示tab
            List<TabButtonInfoDTO> tabList = new LinkedList<>();
@@ -314,19 +321,19 @@
                            || FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(dslxq);
                        tabList.add(sqjl);
                        // 额外单独给详情跳转查看
                        daxx.setName("详情");
                        tabList.add(daxx);

                        sl.setName("自行受理");
                        buttonList.add(sl);
                        buttonList.add(jb);
                        buttonList.add(bysl);
                        buttonList.add(xqcl);
                        CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
                        if (UserBaseConsts.UNIT_GRADE_1 != ctUnitDTO.getUnitGrade()) {
                            buttonList.add(sb);
                        }

                        // 额外单独给详情跳转查看
                        daxx.setName("详情");
                        tabList.add(daxx);
                    }
                    // 待受理节点
                    if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())
@@ -334,14 +341,13 @@
                            || FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(dslxq);
                        tabList.add(sqjl);

                        buttonList.add(sl);
                        buttonList.add(ht);
//                        buttonList.add(bysl);

                        // 额外单独给详情跳转查看
                        daxx.setName("详情");
                        tabList.add(daxx);

                        buttonList.add(sl);
                        buttonList.add(ht);
                        buttonList.add(xqcl);
                    }
                    // 回退审核节点
                    if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())
@@ -352,10 +358,11 @@
                        tabList.add(sxxq);
                        tabList.add(sqjl);
                        tabList.add(htsh);

                        // 额外单独给详情跳转查看
                        daxx.setName("详情");
                        tabList.add(daxx);

                        buttonList.add(tabcl);
                    }
                    // 上报审核节点
                    if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())
@@ -364,10 +371,11 @@
                        tabList.add(sxxq);
                        tabList.add(sqjl);
                        tabList.add(sbsh);

                        // 额外单独给详情跳转查看
                        daxx.setName("详情");
                        tabList.add(daxx);

                        buttonList.add(tabcl);
                    }
                    // 办理反馈节点
                    if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
@@ -376,26 +384,25 @@
                            tabList.add(sxbl);
                            tabList.add(lcdb);
                            tabList.add(sqjl);
                            // 额外单独给详情跳转查看
                            daxx.setName("详情");
                            tabList.add(daxx);

                            buttonList.add(tjbljl);
                            buttonList.add(lhczsq);
                            buttonList.add(jasq);
//                            buttonList.add(db);

                            // 额外单独给详情跳转查看
                            daxx.setName("详情");
                            tabList.add(daxx);
                            buttonList.add(tabcl);
                        } else {
                            tabList.add(sxxq);
                            tabList.add(sxbl);
                            tabList.add(lcdb);
                            tabList.add(sqjl);

                            buttonList.add(tjbljl);

                            // 额外单独给详情跳转查看
                            daxx.setName("详情");
                            tabList.add(daxx);

                            buttonList.add(tjbljl);
                            buttonList.add(tabcl);
                        }
                    }
                    // 结案审核节点
@@ -405,10 +412,11 @@
                        tabList.add(sxxq);
                        tabList.add(sqjl);
                        tabList.add(jash);

                        // 额外单独给详情跳转查看
                        daxx.setName("详情");
                        tabList.add(daxx);

                        buttonList.add(tabcl);
                    }
                    // 当事人评价节点
                    if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
@@ -427,13 +435,13 @@
                    if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(dslxq);
                        tabList.add(sqjl);

                        buttonList.add(sl);
                        buttonList.add(ht);

                        // 额外单独给详情跳转查看
                        daxx.setName("详情");
                        tabList.add(daxx);

                        buttonList.add(sl);
                        buttonList.add(ht);
                        buttonList.add(tabcl);
                    }
                }
            }else {
@@ -635,13 +643,10 @@
            if (CollectionUtils.isNotEmpty(caseAssistInfoList)){
                LinkedList<WebAssistCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
                for (CaseAssistInfo caseAssistInfo: caseAssistInfoList){
                    if (CaseTaskConsts.ASSIST_STATUS_0 == caseAssistInfo.getAssistStatus()) {
                    WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
                    webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId());
                    if (CaseTaskConsts.ASSIST_STATUS_0 == caseAssistInfo.getAssistStatus()) {
                        webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName());
                    }else {
                        webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName()+"（已回退）");
                    }
                    LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
                    // 首节点
                    WebCaseFlowDTO lfdjAssist = new WebCaseFlowDTO();
@@ -788,6 +793,14 @@
                    }
                    webAssistCaseFlowDTO.setCaseFlowList(caseFlowList);
                    assistCaseFlowList.add(webAssistCaseFlowDTO);
                    }else {
                        WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
                        webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUnitId());
                        webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName()+"（已回退）");
                        LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
                        webAssistCaseFlowDTO.setCaseFlowList(caseFlowList);
                        assistCaseFlowList.add(webAssistCaseFlowDTO);
                    }
                }
                result.put("assistCaseFlowList", assistCaseFlowList);
            }
@@ -2888,11 +2901,19 @@
                        mapper.updateCaseTask(assistCaseTask);
                        // 结束配合组织当前工作流任务
                        flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
                        // 更新联合处置信息
                        UpdateWrapper<CaseAssistInfo> caseAssistInfoUpdateWrapper = new UpdateWrapper<>();
                        caseAssistInfoUpdateWrapper.eq("case_id", htshCaseTask.getCaseId())
                                .eq("process_instance_id", assistCaseTask.getProcessInstanceId())
                                .eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0).set("assist_status", CaseTaskConsts.ASSIST_STATUS_2);
                        caseAssistInfoService.update(caseAssistInfoUpdateWrapper);
                    }
                }else {
                    // 更新联合处置信息
                    QueryWrapper<CaseAssistInfo> caseAssistInfoQueryWrapper = new QueryWrapper<>();
                    caseAssistInfoQueryWrapper.eq("case_id", htshCaseTask.getCaseId()).eq("assist_unit_id", htshCaseTask.getCandeUnitId()).eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0);
                    caseAssistInfoQueryWrapper.eq("case_id", htshCaseTask.getCaseId())
                            .eq("assist_unit_id", htshCaseTask.getCandeUnitId())
                            .eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0);
                    CaseAssistInfo caseAssistInfo = caseAssistInfoService.getOne(caseAssistInfoQueryWrapper);
                    if (ObjectUtils.isNotEmpty(caseAssistInfo)){
                        caseAssistInfo.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_1);