From 4f758d50ae3471e32855ac5466379de9b1abbbdc Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Mon, 9 Feb 2026 16:21:15 +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=8F=92=E5=85=A5=E6=84=8F=E8=A7=81=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TBizRemPunishmentServiceImpl.java    | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

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 20315c1..9d127aa 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
@@ -6,6 +6,7 @@ import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit;
 import com.chinaweal.aiccs.aiccs.abnormal.service.CreatePdfService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
+import com.chinaweal.aiccs.aiccs.auditing.entity.TSOpinion;
 import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList;
 import com.chinaweal.aiccs.aiccs.business.service.TSTaskListService;
 import com.chinaweal.aiccs.aiccs.inspect.service.TSWorkNoService;
@@ -133,10 +134,14 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
         String isAgreeRepair = tBizRemPunishment.getIsAgreeRepair();
         String nextNodeID = tBizRemPunishment.getNextNodeId();
 
+        //封装意见表
+        String opinionContent = tBizRemPunishment.getOpinion();
+        TSOpinion opinion = createOpinion(opinionContent, tsTaskList, loginUser);
+
         //外网申请的且不受理的情况下，意见值给到回退建议
         if(StringUtils.equals(tsTaskList.getOrigin(),"1")
                 && StringUtils.equals(isAccept,"0")){
-            tBizRemPunishment.setBackProposal(tBizRemPunishment.getOpinion());
+            tBizRemPunishment.setBackProposal(opinionContent);
         }
 
         //不予受理的情况直接可以结束流程
@@ -144,31 +149,43 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
             tBizRemPunishment.setStatus("3");
             nextNodeID = "disagreeRemPunish";
             tBizRemPunishment.setLinkType("3"); //设置下一环节
+            opinion.setOpiniontype("0")
+                    .setIsagree("2");
         } else {        //予以受理的情况下再看下一节点
             //根据当前下一步节点判断
             if("handleRemPunish".equals(nextNodeID)){  //下一步是审核
                 tBizRemPunishment.setLinkType("0"); //设置下一环节
+                opinion.setOpiniontype("0")
+                        .setIsagree("1");
             } else if("approveRemPunish".equals(nextNodeID)){  //下一步是审批
                 tBizRemPunishment.setLinkType("2"); //设置下一环节
+                opinion.setOpiniontype("1")
+                        .setIsagree("1");
             } else if("endRemPunish".equals(nextNodeID)){  //下一步是结束流程
+                opinion.setOpiniontype("2");
                 //最后一步才设置业务状态为通过或者不通过
                 if(StringUtils.equals(isAgreeRepair,"0")){     //不予修复
                     //文书模板数据转为文书正式数据
                     this.handleTsWrit(tBizRemPunishment, tswrittemplate);
                     tBizRemPunishment.setStatus("3"); //设置业务状态为不通过
+                    opinion.setIsagree("0");
                 } else {     //准予修复
                     //文书模板数据转为文书正式数据
                     this.handleTsWrit(tBizRemPunishment, tswrittemplate);
                     //行政处罚信用修复信息插入数据
                     insertCaseCreInformation(tBizRemPunishment);
                     tBizRemPunishment.setStatus("2"); //设置业务状态为通过
+                    opinion.setIsagree("1");
                 }
                 tBizRemPunishment.setLinkType("3"); //设置下一环节为结束
             } else if("returnRemPunish".equals(nextNodeID)){  //下一步是回退上一步
+                opinion.setIsagree("2");
                 if(StringUtils.equals(linkType,"0")){   //审核回退到受理
                     tBizRemPunishment.setLinkType("1"); //设置下一环节
-                } else if(StringUtils.equals(linkType,"2")){   //审批回退到审批
+                    opinion.setOpiniontype("1");
+                } else if(StringUtils.equals(linkType,"2")){   //审批回退到审核
                     tBizRemPunishment.setLinkType("0"); //设置下一环节
+                    opinion.setOpiniontype("2");
                 } else {    //无法回退
                     throw new RuntimeException("无法回退到上一步");
                 }
@@ -180,7 +197,7 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
         this.updateById(tBizRemPunishment);
 
         // 流程推进
-        taskListService.updateWorkFlow(loginUser, null, tsTaskList,
+        taskListService.updateWorkFlow(loginUser, opinion, tsTaskList,
                 nextNodeID, new String[]{ loginUser.getPrimaryKey() }, new String[]{ loginUser.getName() });
     }
 
@@ -288,4 +305,19 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
         return tBizRemPunishment;
     }
 
+    private TSOpinion createOpinion(String opinioncontent,TSTaskList taskListModel, AICUser aicUser) {
+        TSOpinion tsOpinion = new TSOpinion();
+        // 初始化意见对象的属性
+        tsOpinion.setOpinionid(IdUtil.simpleUUID());
+        tsOpinion.setBizseq(taskListModel.getBizseqid());
+        tsOpinion.setWorkflowid(taskListModel.getTasklistid());
+        tsOpinion.setHandlerid(aicUser.getPrimaryKey());
+        tsOpinion.setHandler(aicUser.getName());
+        tsOpinion.setOpinioncontent(opinioncontent);
+        tsOpinion.setHandledate(LocalDateTime.now());
+        tsOpinion.setAreaCode(aicUser.getRegionID().substring(0, 6));
+        tsOpinion.setLauptime(LocalDateTime.now());
+        return tsOpinion;
+    }
+
 }