From b79ebdd2d44ef3ca3989309c4fa7aadd4b2b00f5 Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Fri, 23 Jan 2026 17:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=A4=84=E7=BD=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B7=BB=E5=8A=A0=E5=A4=96=E7=BD=91=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../punishment/controller/TBizRemPunishmentController.java  | 4 ++++
 .../aiccs/aiccs/punishment/entity/TBizRemPunishment.java    | 6 ++++++
 .../service/impl/TBizRemPunishmentServiceImpl.java          | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java
index dea296d..6ab9888 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java
@@ -1,6 +1,7 @@
 package com.chinaweal.aiccs.aiccs.punishment.controller;
 
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
@@ -110,9 +111,12 @@ public class TBizRemPunishmentController extends BaseController {
     public RestResult<?> getTBizRemPunishment(@RequestParam @ApiParam("id") Serializable id) {
         TBizRemPunishment tBizRemPunishment = iTBizRemPunishmentService.getById(id);
         TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
+        TSTaskList task = taskListService.getOne(new LambdaQueryWrapper<TSTaskList>()
+                .eq(TSTaskList::getBizseqid, tBizRemPunishment.getBizSeq()));
         return RestResult.ok(new HashMap<String, Object>(){{
             put("punishInfo", tBizRemPunishment);
             put("IlcPunInfo", tbIlcPunInfoQuery);
+            put("task", task);
         }});
     }
 
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 672709b..5fe2c50 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
@@ -123,5 +123,11 @@ public class TBizRemPunishment extends SuperEntity {
     @TableField(exist = false)
     String opinion;
 
+    /**
+     * 回退建议
+     */
+    @TableField("backProposal")
+    private String backProposal;
+
 
 }
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 7e5c452..7b6a149 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
@@ -121,6 +121,12 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
         String nextNodeID = null;
         String status = tBizRemPunishment.getStatus();
 
+        //外网申请的且不受理的情况下，意见值给到回退建议
+        if(StringUtils.equals(tsTaskList.getOrigin(),"1")
+                && StringUtils.equals(tBizRemPunishment.getStatus(),"3")){
+            tBizRemPunishment.setBackProposal(tBizRemPunishment.getOpinion());
+        }
+
         //根据当前环节判断
         if(StringUtils.equals(linkType,"1")){   //受理状态，需要提交审批人或直接不予修复结束
             if(StringUtils.equals(status,"3")){     //不予修复，直接结束流程