1、一二级事件流程优化

liyj

2024-10-15 efa7c238ab4608dbd6e57983cf1d5c53470867bc

1、一二级事件流程优化

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml

@@ -410,6 +410,9 @@
            <if test="terms.partyName != null and terms.partyName !=''">
                and concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
            </if>
            <if test="terms.status == 2">
                and t1.handle_result in (0, 1, 2)
            </if>
        </if>
    </sql>
    <!--  工作台-待/已分派条件统计  -->

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

@@ -399,7 +399,9 @@
                        }
                    }
                    // 结案审核节点
                    if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
                    if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())
                            || FlowNodeEnum.FLOW_NODE_JASH_YJ.getIndex().equals(caseTask.getNodeId())
                            ||FlowNodeEnum.FLOW_NODE_JASH_EJ.getIndex().equals(caseTask.getNodeId())) {
                        tabList.add(sxxq);
                        tabList.add(sqjl);
                        tabList.add(jash);
@@ -556,6 +558,8 @@
                    }
                    // 审核节点要判断通过/不通过
                    if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH_YJ.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH_EJ.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex())
                            || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex())
@@ -2392,12 +2396,12 @@
                CaseInfo caseInfo = caseInfoService.getById(jashCaseTask.getCaseId());
                if (CaseBaseConsts.CASE_LEVEL_1 == caseInfo.getCaseLevel()){
                    // 一级事件，本级+上级+上上级审核
                    if (FlowNodeEnum.FLOW_NODE_JASH.equals(jashCaseTask.getNodeId())){
                    if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(jashCaseTask.getNodeId())){
                        // 完成本级综治中心审核，进入上级综治中心审核节点
                        nextFlowNode = flowInfoService.completeTask(jashCaseTask.getFlowableId(), jashCaseTask.getProcessTaskId(),
                                FlowableConsts.OPERATION_jash_ty_sq, userId);

                    }else if (FlowNodeEnum.FLOW_NODE_JASH_YJ.equals(jashCaseTask.getNodeId())){
                    }else if (FlowNodeEnum.FLOW_NODE_JASH_YJ.getIndex().equals(jashCaseTask.getNodeId())){
                        // 完成上级综治中心审核，进入上上级综治中心审核节点
                        nextFlowNode = flowInfoService.completeTask(jashCaseTask.getFlowableId(), jashCaseTask.getProcessTaskId(),
                                FlowableConsts.OPERATION_jash_ty_sq, userId);
@@ -2410,7 +2414,7 @@
                }else if (CaseBaseConsts.CASE_LEVEL_2 == caseInfo.getCaseLevel()){
                    // 二级事件，本级+上级审核
                    String operation = FlowableConsts.OPERATION_jash_ty;
                    if (FlowNodeEnum.FLOW_NODE_JASH.equals(jashCaseTask.getNodeId())){
                    if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(jashCaseTask.getNodeId())){
                        // 完成本级综治中心审核，进入上级综治中心审核节点
                        nextFlowNode = flowInfoService.completeTask(jashCaseTask.getFlowableId(), jashCaseTask.getProcessTaskId(),
                                FlowableConsts.OPERATION_jash_ty_sq, userId);