From 1593720260856fe5a6d48a65f7bf7684d68bfe2b Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Wed, 4 Feb 2026 20:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=A4=84=E7=BD=9A=E4=BF=A1?=
 =?UTF-8?q?=E7=94=A8=E4=BF=AE=E5=A4=8D=E6=94=B9=E4=B8=BA=E4=B8=89=E7=BA=A7?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../punishment/entity/TBizRemPunishment.java  |  8 ++-
 .../impl/TBizRemPunishmentServiceImpl.java    | 65 ++++++++++---------
 .../workFlow/RemPunishWorkFlowTmp.xml         | 10 ++-
 3 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java
index 6a9b6c8..f24b07f 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java
@@ -71,9 +71,9 @@ public class TBizRemPunishment extends SuperEntity {
     private String status;
 
     /**
-     * 当前环节 1-业务受理 2-业务审批 3-业务结束
+     * 当前环节 1-业务受理 0-执法人员审核 2-业务审批 3-业务结束
      */
-    @ApiModelProperty(value = "当前环节 1-业务受理 2-业务审批 3-业务结束")
+    @ApiModelProperty(value = "当前环节 1-业务受理 0-执法人员审核 2-业务审批 3-业务结束")
     @TableField("linkType")
     private String linkType;
 
@@ -143,4 +143,8 @@ public class TBizRemPunishment extends SuperEntity {
     @TableField(exist = false)
     String opinion;
 
+    @ApiModelProperty(value = "下一个节点id")
+    @TableField(exist = false)
+    String nextNodeId;
+
 }
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
index 4da7b18..20315c1 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
@@ -129,45 +129,52 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
         AICUser loginUser = SSOUtil.getUser();
         //当前环节
         String linkType = tBizRemPunishment.getLinkType();
-        String nextNodeID = null;
-        String status = tBizRemPunishment.getStatus();
         String isAccept = tBizRemPunishment.getIsAccept();
         String isAgreeRepair = tBizRemPunishment.getIsAgreeRepair();
+        String nextNodeID = tBizRemPunishment.getNextNodeId();
 
         //外网申请的且不受理的情况下，意见值给到回退建议
         if(StringUtils.equals(tsTaskList.getOrigin(),"1")
                 && StringUtils.equals(isAccept,"0")){
             tBizRemPunishment.setBackProposal(tBizRemPunishment.getOpinion());
         }
-        //只有受理并予以修复，status才是2，其他都是3
-        if(StringUtils.equals(isAccept,"1")
-                && StringUtils.equals(isAgreeRepair,"1")){
-            tBizRemPunishment.setStatus("2");
-        } else {
-            tBizRemPunishment.setStatus("3");
-        }
 
-        //根据当前环节判断
-        if(StringUtils.equals(linkType,"1")){   //受理状态，需要提交审批人或直接不予受理结束
-            if(StringUtils.equals(isAccept,"0")){   //不予受理，直接结束流程
-                nextNodeID = "disagreeRemPunish";
-                tBizRemPunishment.setLinkType("3"); //设置下一环节
-            } else {     //受理，无论是修复还是不修复，都提交给审批人
-                nextNodeID = "approveRemPunish";
-                tBizRemPunishment.setLinkType("2"); //设置下一环节
-            }
-        } else if(StringUtils.equals(linkType,"2")){    //审批状态，需要结束流程
-            if(StringUtils.equals(status,"3")){     //不予修复
-                //文书模板数据转为文书正式数据
-                this.handleTsWrit(tBizRemPunishment, tswrittemplate);
-            } else {     //准予修复
-                //文书模板数据转为文书正式数据
-                this.handleTsWrit(tBizRemPunishment, tswrittemplate);
-                //行政处罚信用修复信息插入数据
-                insertCaseCreInformation(tBizRemPunishment);
-            }
-            nextNodeID = "endRemPunish";
+        //不予受理的情况直接可以结束流程
+        if(StringUtils.equals(isAccept,"0")){
+            tBizRemPunishment.setStatus("3");
+            nextNodeID = "disagreeRemPunish";
             tBizRemPunishment.setLinkType("3"); //设置下一环节
+        } else {        //予以受理的情况下再看下一节点
+            //根据当前下一步节点判断
+            if("handleRemPunish".equals(nextNodeID)){  //下一步是审核
+                tBizRemPunishment.setLinkType("0"); //设置下一环节
+            } else if("approveRemPunish".equals(nextNodeID)){  //下一步是审批
+                tBizRemPunishment.setLinkType("2"); //设置下一环节
+            } else if("endRemPunish".equals(nextNodeID)){  //下一步是结束流程
+                //最后一步才设置业务状态为通过或者不通过
+                if(StringUtils.equals(isAgreeRepair,"0")){     //不予修复
+                    //文书模板数据转为文书正式数据
+                    this.handleTsWrit(tBizRemPunishment, tswrittemplate);
+                    tBizRemPunishment.setStatus("3"); //设置业务状态为不通过
+                } else {     //准予修复
+                    //文书模板数据转为文书正式数据
+                    this.handleTsWrit(tBizRemPunishment, tswrittemplate);
+                    //行政处罚信用修复信息插入数据
+                    insertCaseCreInformation(tBizRemPunishment);
+                    tBizRemPunishment.setStatus("2"); //设置业务状态为通过
+                }
+                tBizRemPunishment.setLinkType("3"); //设置下一环节为结束
+            } else if("returnRemPunish".equals(nextNodeID)){  //下一步是回退上一步
+                if(StringUtils.equals(linkType,"0")){   //审核回退到受理
+                    tBizRemPunishment.setLinkType("1"); //设置下一环节
+                } else if(StringUtils.equals(linkType,"2")){   //审批回退到审批
+                    tBizRemPunishment.setLinkType("0"); //设置下一环节
+                } else {    //无法回退
+                    throw new RuntimeException("无法回退到上一步");
+                }
+            } else {    //流程无法找到
+                throw new RuntimeException("流程无法找到");
+            }
         }
         //修改业务表
         this.updateById(tBizRemPunishment);
diff --git a/src/main/resources/workFlow/RemPunishWorkFlowTmp.xml b/src/main/resources/workFlow/RemPunishWorkFlowTmp.xml
index 5f30ef8..e4a2e70 100644
--- a/src/main/resources/workFlow/RemPunishWorkFlowTmp.xml
+++ b/src/main/resources/workFlow/RemPunishWorkFlowTmp.xml
@@ -2,13 +2,21 @@
 <workflow definedname="RemPunishWorkFlowTmp" description="行政处罚修复">
     <nodes>
         <node id="startAccept" name="经办" description="行政处罚修复经办" start="true"/>
+        <node id="handleRemPunish" name="审核" description="行政处罚修复审核"/>
         <node id="approveRemPunish" name="审批" description="行政处罚修复审核"/>
+        <node id="returnRemPunish" name="回退上一步" description="行政处罚修复回退上一步"/>
         <node id="endRemPunish" name="结束流程" description="结束流程" end="true" handle="false"/>
         <node id="disagreeRemPunish" name="不予修复" description="结束流程" end="true" handle="false"/>
     </nodes>
 
     <sequenceFlow id="startAccept_endRemPunish" name="流程结束" description="经办——结束"/>
-    <sequenceFlow id="startAccept_approveRemPunish" name="流程审批" description="经办——审批"/>
+    <sequenceFlow id="startAccept_handleRemPunish" name="流程审核" description="经办——审核"/>
+    <sequenceFlow id="handleRemPunish_approveRemPunish" name="流程审批" description="经办——审批"/>
+    <sequenceFlow id="handleRemPunish_returnRemPunish" name="审核回退至经办" description="审核——经办"/>
+    <sequenceFlow id="returnRemPunish_handleRemPunish" name="回退后再次提交给审核" description="经办——审核"/>
     <sequenceFlow id="approveRemPunish_endRemPunish" name="流程结束" description="审批——结束"/>
+    <sequenceFlow id="approveRemPunish_returnRemPunish" name="审批回退至审核" description="审批——审核"/>
+    <sequenceFlow id="returnRemPunish_approveRemPunish" name="回退后再次提交给审批" description="审核——审批"/>
+    <sequenceFlow id="returnRemPunish_returnRemPunish" name="审批回退至审核" description="审批——审核"/>
     <sequenceFlow id="startAccept_disagreeRemPunish" name="不予修复" description="经办——结束"/>
 </workflow>