补充与修正自然人列严相关接口

2026-03-18 17:40:09 +08:00 · 2026-03-18 17:40:09 +08:00 · 4ddde3facf
parent 519edf692e
commit 4ddde3facf
7 changed files with 209 additions and 4 deletions
--- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegalPerson/controller/XrSeriousIllegalPersonRemListController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegalPerson/controller/XrSeriousIllegalPersonRemListController.java
@ -9,6 +9,8 @@ import com.chinaweal.aiccs.aiccs.business.entity.XrOpinion;
 import com.chinaweal.aiccs.aiccs.business.entity.XrTaskList;
 import com.chinaweal.aiccs.aiccs.business.entity.dto.ApprovalFormDto;
 import com.chinaweal.aiccs.aiccs.business.entity.vo.XrTaskListVo;
+import com.chinaweal.aiccs.aiccs.business.rules.model.NodeModel;
+import com.chinaweal.aiccs.aiccs.business.rules.model.SequenceFlowModel;
 import com.chinaweal.aiccs.aiccs.business.service.IXrActivityService;
 import com.chinaweal.aiccs.aiccs.business.service.IXrOpinionService;
 import com.chinaweal.aiccs.aiccs.business.service.IXrTaskListService;
@ -20,6 +22,7 @@ import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.dto.PersonSpeSaveIv
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.dto.SeriousIllegalListQueryDto;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.dto.SeriousIllegalProcessRemDto;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.dto.SeriousIllegalSpeQueryDto;
+import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.vo.TaskCurrentInfoVo;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.service.IXrSeriousIllegalPersonListService;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.service.IXrSeriousIllegalPersonRemListService;
 import com.chinaweal.aiccs.common.base.controller.BaseController;
@ -140,6 +143,44 @@ public class XrSeriousIllegalPersonRemListController extends BaseController {
        return RestResult.ok(approvalDto);
    }

+    @ApiOperation(value = "6.下一步可执行流程清单", position = 6)
+    @GetMapping("/getNextStepList")
+    public RestResult<List<SequenceFlowModel>> getNextStepList(@RequestParam @ApiParam("业务号") String bizSeqNo) {
+        // 根据业务号查询待办记录
+        XrTaskList xrTaskList = iXrTaskListService.getOne(
+                new LambdaQueryWrapper<XrTaskList>().eq(XrTaskList::getBizSeqNo, bizSeqNo)
+        );
+        if (xrTaskList == null) {
+            throw new BusinessException("未找到该业务的待办记录");
+        }
+        // 查询下一步可执行的流程清单
+        List<SequenceFlowModel> nextStepList = iXrActivityService.findNextSequenceFlowList(xrTaskList.getTaskLikeId());
+        return RestResult.ok(nextStepList);
+    }
+
+    @ApiOperation(value = "7.查询当前待办信息", position = 7)
+    @GetMapping("/getCurrentTaskInfo")
+    public RestResult<TaskCurrentInfoVo> getCurrentTaskInfo(@RequestParam @ApiParam("业务号") String bizSeqNo) {
+        // 根据业务号查询待办记录
+        XrTaskList xrTaskList = iXrTaskListService.getOne(
+                new LambdaQueryWrapper<XrTaskList>().eq(XrTaskList::getBizSeqNo, bizSeqNo)
+        );
+        if (xrTaskList == null) {
+            throw new BusinessException("未找到该业务的待办记录");
+        }
+        // 获取当前节点信息
+        NodeModel currentNode = iXrActivityService.findCurrentNode(xrTaskList.getTaskLikeId());
+        
+        // 封装返回结果
+        TaskCurrentInfoVo result = new TaskCurrentInfoVo();
+        result.setTaskList(xrTaskList);
+        result.setCurrentNode(currentNode);
+        if (currentNode != null) {
+            result.setCurrentNodeID(currentNode.getId());
+        }
+        return RestResult.ok(result);
+    }
+
    /**
     * 打印文书页面
     */
--- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegalPerson/controller/XrSeriousIllegalPersonSpeListController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegalPerson/controller/XrSeriousIllegalPersonSpeListController.java
@ -9,6 +9,8 @@ import com.chinaweal.aiccs.aiccs.business.entity.XrOpinion;
 import com.chinaweal.aiccs.aiccs.business.entity.XrTaskList;
 import com.chinaweal.aiccs.aiccs.business.entity.dto.ApprovalFormDto;
 import com.chinaweal.aiccs.aiccs.business.entity.vo.XrTaskListVo;
+import com.chinaweal.aiccs.aiccs.business.rules.model.NodeModel;
+import com.chinaweal.aiccs.aiccs.business.rules.model.SequenceFlowModel;
 import com.chinaweal.aiccs.aiccs.business.service.IXrActivityService;
 import com.chinaweal.aiccs.aiccs.business.service.IXrOpinionService;
 import com.chinaweal.aiccs.aiccs.business.service.IXrTaskListService;
@ -18,6 +20,7 @@ import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.XrSeriousIllegalPer
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.dto.PersonSpeSaveIvdDto;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.dto.SeriousIllegalProcessDto;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.dto.SeriousIllegalSpeQueryDto;
+import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.vo.TaskCurrentInfoVo;
 import com.chinaweal.aiccs.aiccs.seriousillegalPerson.service.IXrSeriousillegalPersonSpeListService;
 import com.chinaweal.aiccs.common.base.controller.BaseController;
 import com.chinaweal.aiccs.common.constant.BaseDataConstant;
@ -147,6 +150,44 @@ public class XrSeriousIllegalPersonSpeListController extends BaseController {
        return RestResult.ok(approvalDto);
    }

+    @ApiOperation(value = "6.下一步可执行流程清单", position = 6)
+    @GetMapping("/getNextStepList")
+    public RestResult<List<SequenceFlowModel>> getNextStepList(@RequestParam @ApiParam("业务号") String bizSeqNo) {
+        // 根据业务号查询待办记录
+        XrTaskList xrTaskList = iXrTaskListService.getOne(
+                new LambdaQueryWrapper<XrTaskList>().eq(XrTaskList::getBizSeqNo, bizSeqNo)
+        );
+        if (xrTaskList == null) {
+            throw new BusinessException("未找到该业务的待办记录");
+        }
+        // 查询下一步可执行的流程清单
+        List<SequenceFlowModel> nextStepList = iXrActivityService.findNextSequenceFlowList(xrTaskList.getTaskLikeId());
+        return RestResult.ok(nextStepList);
+    }
+
+    @ApiOperation(value = "7.查询当前待办信息", position = 7)
+    @GetMapping("/getCurrentTaskInfo")
+    public RestResult<TaskCurrentInfoVo> getCurrentTaskInfo(@RequestParam @ApiParam("业务号") String bizSeqNo) {
+        // 根据业务号查询待办记录
+        XrTaskList xrTaskList = iXrTaskListService.getOne(
+                new LambdaQueryWrapper<XrTaskList>().eq(XrTaskList::getBizSeqNo, bizSeqNo)
+        );
+        if (xrTaskList == null) {
+            throw new BusinessException("未找到该业务的待办记录");
+        }
+        // 获取当前节点信息
+        NodeModel currentNode = iXrActivityService.findCurrentNode(xrTaskList.getTaskLikeId());
+        
+        // 封装返回结果
+        TaskCurrentInfoVo result = new TaskCurrentInfoVo();
+        result.setTaskList(xrTaskList);
+        result.setCurrentNode(currentNode);
+        if (currentNode != null) {
+            result.setCurrentNodeID(currentNode.getId());
+        }
+        return RestResult.ok(result);
+    }
+
    /**
     * 打印文书页面
     */
--- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegalPerson/entity/vo/TaskCurrentInfoVo.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegalPerson/entity/vo/TaskCurrentInfoVo.java
@ -0,0 +1,27 @@
+package com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.vo;
+
+import com.chinaweal.aiccs.aiccs.business.entity.XrTaskList;
+import com.chinaweal.aiccs.aiccs.business.rules.model.NodeModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 当前待办信息VO
+ *
+ * @author system
+ * @since 2026-03-18
+ */
+@Data
+@ApiModel("当前待办信息")
+public class TaskCurrentInfoVo {
+
+    @ApiModelProperty("待办信息")
+    private XrTaskList taskList;
+
+    @ApiModelProperty("当前节点信息")
+    private NodeModel currentNode;
+
+    @ApiModelProperty("当前节点ID")
+    private String currentNodeID;
+}
--- a/src/main/resources/mybatis/mapper/aiccs/seriousillegalPerson/XrSeriousIllegalPersonRemListMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/seriousillegalPerson/XrSeriousIllegalPersonRemListMapper.xml
@ -4,7 +4,9 @@

    <select id="listTodoByOrg"
            resultType="com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.XrSeriousIllegalPersonRemList">
-        SELECT distinct
+        SELECT distinct *
+        from (
+        select
        task.accept_no as acceptNo,
        biz.biz_seq_no as bizSeqNo,
        biz.illegal_list_id as illegalListId,
@ -57,6 +59,7 @@
            AND biz.status not in ('5')
        </where>
        order by biz.update_time desc
+        ) a
    </select>

    <select id="listRecordByOrg"
--- a/src/main/resources/mybatis/mapper/aiccs/seriousillegalPerson/XrSeriousIllegalPersonSpeListMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/seriousillegalPerson/XrSeriousIllegalPersonSpeListMapper.xml
@ -61,8 +61,9 @@
    </resultMap>

    <select id="selectXrSeriousIllegalPersonSpeListTodo" resultType="com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.XrSeriousIllegalPersonSpeList">
-        select distinct
-        task.biz_seq_no as bizSeqNo,
+        SELECT DISTINCT *
+        FROM (
+        SELECT task.biz_seq_no as bizSeqNo,
        biz.serill_rea as serillRea,
        biz.inv as inv,
        biz.cer_type as cerType,
@ -110,6 +111,7 @@
            </if>
        </where>
        order by biz.update_time desc
+        ) a
    </select>

    <select id="selectXrSeriousIllegalPersonSpeListHistory" resultType="com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.XrSeriousIllegalPersonSpeList">
@ -122,7 +124,6 @@
        biz.cer_no as cerNo,
        biz.area_code as areaCode,
        biz.status as status,
-        biz.serill_rea as serillRea,
        biz.serill_rea_string as serillReaString,
        biz.abn_time as abnTime,
        biz.dec_org as decOrg,
--- a/src/main/resources/workFlow/seriousRemWorkFlow.xml
+++ b/src/main/resources/workFlow/seriousRemWorkFlow.xml
@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workflow definedname="seriousRemWorkFlow" description="严重违法移出流程模板">
+    <nodes>
+        <node id="handle" name="经办" description="经办" start="true"/>
+        <node id="replenish" name="材料补正" description="材料补正" />
+        <node id="transfer" name="转办" description="转办" />
+        <node id="examine" name="审核" description="审核"/>
+        <node id="handleReturn" name="审核回退" description="经办"/>
+        <node id="examineReturn" name="审批回退" description="审核"/>
+        <node id="approve" name="审批" description="审批"/>
+        <node id="nullify" name="作废" description="作废" end="true"/>
+        <node id="examineFinish" name="结束流程" description="审核不通过" end="true" handle="false"/>
+        <node id="approveFinish" name="结束流程" description="审批不通过" end="true" handle="false"/>
+        <node id="end" name="结束流程" description="办结" end="true" handle="false"/>
+    </nodes>
+
+    <sequenceFlow id="handle_examine" name="下一步" description="经办_审核"/>
+    <sequenceFlow id="handle_nullify" name="删除业务" description="经办_线索作废"/>
+<!--    <sequenceFlow id="handle_transfer" name="线索转办" description="转办"/>-->
+
+    <sequenceFlow id="transfer_examine" name="审核" description="转办_审核"/>
+    <sequenceFlow id="transfer_nullify" name="线索作废" description="转办_线索作废"/>
+
+    <sequenceFlow id="examine_approve" name="通过" description="审核_审批"/>
+    <sequenceFlow id="examine_examineFinish" name="不通过" description="审核_不同意-结束"/>
+    <sequenceFlow id="examine_handleReturn" name="回退" description="审核_经办"/>
+    <sequenceFlow id="examine_nullify" name="删除业务" description="审核_线索作废"/>
+
+    <sequenceFlow id="approve_end" name="通过" description="审批_结束"/>
+    <sequenceFlow id="approve_approveFinish" name="不通过" description="审批_不同意-结束"/>
+    <sequenceFlow id="approve_examineReturn" name="回退" description="审批_审核"/>
+    <sequenceFlow id="approve_nullify" name="删除业务" description="审批_线索作废"/>
+
+    <sequenceFlow id="handleReturn_examine" name="下一步" description="经办_审核"/>
+    <sequenceFlow id="handleReturn_nullify" name="删除业务" description="经办_线索作废"/>
+    <sequenceFlow id="handleReturn_transfer" name="线索转办" description="转办"/>
+
+    <sequenceFlow id="examineReturn_approve" name="通过" description="审核_审批"/>
+    <sequenceFlow id="examineReturn_examineFinish" name="不通过" description="审核_不同意-结束"/>
+    <sequenceFlow id="examineReturn_handleReturn" name="回退" description="审核_经办"/>
+    <sequenceFlow id="examineReturn_nullify" name="删除业务" description="审核_线索作废"/>
+
+<!--    结束到经办，主要用于拟强制注销变为强制注销的业务-->
+    <sequenceFlow id="end_handle" name="经办" description="结束_经办"/>
+
+</workflow>
--- a/src/main/resources/workFlow/seriousWorkFlowTwo.xml
+++ b/src/main/resources/workFlow/seriousWorkFlowTwo.xml
@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workflow definedname="seriousWorkFlowTwo" description="一级严重违法模板">
+    <nodes>
+        <node id="handle" name="经办" description="经办" start="true"/>
+        <node id="replenish" name="材料补正" description="材料补正" />
+        <node id="transfer" name="转办" description="转办" />
+        <node id="examine" name="审核" description="审核"/>
+        <node id="handleReturn" name="审核回退" description="经办"/>
+        <node id="examineReturn" name="审批回退" description="审核"/>
+        <node id="approve" name="审批" description="审批"/>
+        <node id="nullify" name="作废" description="作废" end="true"/>
+        <node id="examineFinish" name="结束流程" description="审核不通过" end="true" handle="false"/>
+        <node id="approveFinish" name="结束流程" description="审批不通过" end="true" handle="false"/>
+        <node id="end" name="结束流程" description="办结" end="true" handle="false"/>
+    </nodes>
+
+    <sequenceFlow id="handle_examine" name="下一步" description="经办_审核"/>
+    <sequenceFlow id="handle_nullify" name="删除业务" description="经办_线索作废"/>
+<!--    <sequenceFlow id="handle_transfer" name="线索转办" description="转办"/>-->
+
+    <sequenceFlow id="transfer_examine" name="审核" description="转办_审核"/>
+    <sequenceFlow id="transfer_nullify" name="线索作废" description="转办_线索作废"/>
+
+    <sequenceFlow id="examine_approve" name="通过" description="审核_审批"/>
+    <sequenceFlow id="examine_examineFinish" name="不通过" description="审核_不同意-结束"/>
+    <sequenceFlow id="examine_handleReturn" name="回退" description="审核_经办"/>
+    <sequenceFlow id="examine_nullify" name="删除业务" description="审核_线索作废"/>
+
+    <sequenceFlow id="approve_end" name="通过" description="审批_结束"/>
+    <sequenceFlow id="approve_approveFinish" name="不通过" description="审批_不同意-结束"/>
+    <sequenceFlow id="approve_examineReturn" name="回退" description="审批_审核"/>
+    <sequenceFlow id="approve_nullify" name="删除业务" description="审批_线索作废"/>
+
+    <sequenceFlow id="handleReturn_examine" name="下一步" description="经办_审核"/>
+    <sequenceFlow id="handleReturn_nullify" name="删除业务" description="经办_线索作废"/>
+    <sequenceFlow id="handleReturn_transfer" name="线索转办" description="转办"/>
+
+    <sequenceFlow id="examineReturn_approve" name="通过" description="审核_审批"/>
+    <sequenceFlow id="examineReturn_examineFinish" name="不通过" description="审核_不同意-结束"/>
+    <sequenceFlow id="examineReturn_handleReturn" name="回退" description="审核_经办"/>
+    <sequenceFlow id="examineReturn_nullify" name="删除业务" description="审核_线索作废"/>
+
+<!--    结束到经办，主要用于拟强制注销变为强制注销的业务-->
+    <sequenceFlow id="end_handle" name="经办" description="结束_经办"/>
+
+</workflow>