From 7860a92fad7e1094b9b71d97dc8d1d401096fb53 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 30 Aug 2023 10:05:27 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E4=B8=AD=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=8F=AF=E6=9F=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=90=8E=E5=9F=B9=E8=AE=AD=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8A=E4=BC=A0=E5=88=B0=E5=AE=A3=E8=B4=AF?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActSarItemsBussEOService.java     | 20 +++++++++++++++++++
 .../impl/SarBussionessStandServiceImpl.java   |  9 +++++++++
 .../SarStandardsInfoMapper.xml                |  2 ++
 3 files changed, 31 insertions(+)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
index bc6d120a..9968f412 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
@@ -350,6 +350,7 @@ public class ActSarItemsBussEOService {
             String standType = String.valueOf(standMap.get("standType"));
             String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS"));
             String standNum = String.valueOf(standMap.get("standNum"));//制修订时顺序号
+            String madelSub = String.valueOf(standMap.get("madelSub")); // 培训文件
 //            String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
             SarBussionessStand sarBussionessStand  = new SarBussionessStand();
 //            if(standMap.containsKey("standId")) {
@@ -472,6 +473,23 @@ public class ActSarItemsBussEOService {
                 } else {
                     relatePro = prcNum;
                 }
+                if (StringUtils.isNotBlank(madelSub)) {
+                    // 查询原宣贯记录
+                    String xgjlBuss = sarBussStandAttrInfoService.selectFieldValByStandId("XGJLBUSS", standId);
+                    if (StringUtils.isNotBlank(xgjlBuss)) {
+                        String[] xgjlBussSplit = xgjlBuss.split(",");
+                        Set<String> xgjlBussSet = new HashSet<>();
+                        for (String xgjlBussData : xgjlBussSplit) {
+                            xgjlBussSet.add(xgjlBussData);
+                        }
+                        xgjlBussSet.add(madelSub);
+                        xgjlBuss = StringUtils.join(xgjlBussSet.toArray(), ',');
+                    } else {
+                        xgjlBuss = madelSub;
+                    }
+                    // 编辑宣贯记录
+                    sarBussStandAttrInfoService.updateStandInfo(standId,"XGJLBUSS",xgjlBuss);
+                }
                 // 编辑标准
                 sarBussionessStand.setId(standId);
                 iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand);
@@ -497,6 +515,8 @@ public class ActSarItemsBussEOService {
 
                 // 编辑相关流程
                 sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",prcNum);
+                // 编辑宣贯记录
+                sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGJLBUSS",madelSub);
             }
             List<SarStandItems> allItems = new ArrayList<>();
             //开始处理条款数据，从去重后的结果中直接处理即可
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 2f55a7fa..94a22cbf 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
@@ -1915,6 +1915,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                         getAttrMap.put("FBGBUSS", obj);
                     }
                 }
+                if (StringUtils.isNotBlank((String) getAttrMap.get("XGJLBUSS"))) {
+                    String[] xgjlBussList = getAttrMap.get("XGJLBUSS").toString().split(",");
+                    StringBuilder xgjlBussName = new StringBuilder();
+                    for (String xgjlBuss : xgjlBussList) {
+                        AttFileEO fileInfo = attFileEOService.getFileInfo(xgjlBuss);
+                        xgjlBussName.append(fileInfo.getOldFileName());
+                    }
+                    getAttrMap.put("xgjlBussName",xgjlBussName.toString());
+                }
             }
             if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) {
                 // 遍历修改所有clob类型的值
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index afcfda21..bb3e4ac3 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -1004,6 +1004,7 @@
             <!-- 标准名称 -->
             <if test="page.standName != null and page.standName != ''">
                 and stand_name like concat(concat('%',#{page.standName}),'%')
+                or stand_en_name like concat(concat('%',#{page.standName},'%'))
                 <!--  or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') -->
                 <!--  or STAND_YEAR like concat(concat('%',#{page.standName}),'%') -->
                 <!--  or STAND_SORT like concat(concat('%',#{page.standName}),'%') -->
@@ -1196,6 +1197,7 @@
             <!-- 标准名称 -->
             <if test="page.standName != null and page.standName != ''">
                 and stand_name like concat(concat('%',#{page.standName}),'%')
+                or stand_en_name like concat(concat('%',#{page.standName}),'%')
                 <!--  or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') -->
                 <!--  or STAND_YEAR like concat(concat('%',#{page.standName}),'%') -->
                 <!--  or STAND_SORT like concat(concat('%',#{page.standName}),'%') -->