From db643736e72a801f58f3c89c532b49b6da25bcbb Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Fri, 1 Dec 2023 13:53:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=A8=E4=BC=81=E6=A0=87=E5=BA=9F?=
 =?UTF-8?q?=E6=AD=A2=E6=B5=81=E7=A8=8B=E8=B5=B0=E5=AE=8C=E5=90=8E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8A=8A=E6=B5=81=E7=A8=8B=E7=BC=96=E5=8F=B7=E6=94=BE?=
 =?UTF-8?q?=E5=85=A5=E7=9B=B8=E5=85=B3=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarBussionessStandController.java         |  4 ++--
 .../service/ISarBussionessStandService.java   |  2 +-
 .../impl/SarBussionessStandServiceImpl.java   | 22 +++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index d70fa400..b6e16691 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -737,8 +737,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
 
     @ApiOperation(value = "企业标准  废止流程 立即废止（或者现行有效）")
     @GetMapping("/repeal")
-    public ResponseMessage repeal(String id,String type){
-        return sarBussionessStandEOService.repeal(id,type);
+    public ResponseMessage repeal(String id,String type,String prcNum){
+        return sarBussionessStandEOService.repeal(id,type,prcNum);
     }
 
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
index 26b308cb..673c7fc8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
@@ -69,7 +69,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
 
     ResponseMessage cleaningDataReview();
 
-    ResponseMessage repeal(String id, String type);
+    ResponseMessage repeal(String id, String type,String prcNum);
 
     String selectMaxStandSn(String standSort);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 0172b219..09c02108 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -4750,19 +4750,37 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     }
 
     @Override
-    public ResponseMessage repeal(String id, String type) {
+    public ResponseMessage repeal(String id, String type,String prcNum) {
         if(type.equals("废止")){
             SarBussionessStand sarBussionessStand = new SarBussionessStand();
             sarBussionessStand.setId(id);
             sarBussionessStand.setTextStatusBuss("3lqnlgmgcn");
             baseMapper.updateById(sarBussionessStand);
             SarBussionessStand sarBussionessStandDB = baseMapper.selectByPrimaryKey(id);
+            Map<String, Object> map = sarBussStandAttrInfoEODao.selectStandFieldAndData("XGLC", id);
+            String content = "";
+            if(map!=null){
+                Object xglc = map.get("XGLC");
+                String xglcStr = Optional.ofNullable(xglc).orElse("").toString();
+                String newXglcStr = "";
+                if (StringUtils.isNotBlank(xglcStr)) {
+                    newXglcStr = xglcStr + ","+ prcNum;
+                } else {
+                    newXglcStr = prcNum;
+                }
+                sarBussStandAttrInfoEODao.updateStandInfo(id,"XGLC",newXglcStr);
+                try {
+                    content = "标准号：" + sarBussionessStandDB.getStandCode() + "《"+ sarBussionessStandDB.getStandName() + "》" + "关联流程由\""+ xglcStr +"\"变为\""+ newXglcStr +"\"";
+                    sarUpdLogEOService.createBaseLog(id,"BUSINESS",content);
+                } catch (Exception e) {
+                    throw new AdcDaBaseException("日志添加失败");
+                }
+            }
             List<DicTypeEO> dicTypeEOS = new ArrayList<>();
             // 添加删除记录
             if (StringUtils.isNotBlank(sarBussionessStandDB.getTextStatusBuss())) {
                 dicTypeEOS = dicTypeEODao.getDicEOByDicTypeCode(sarBussionessStandDB.getTextStatusBuss());
             }
-            String content = "";
             if (dicTypeEOS.size()>0) {
                 content = "标准号：" + sarBussionessStandDB.getStandCode() + "《"+ sarBussionessStandDB.getStandName() + "》" + "文本状态由\""+ dicTypeEOS.get(0).getDicTypeName() +"\"变为\"废止\"";
             }