From 9f5806520bfccb4822d69702b020a0ec3de87055 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Wed, 19 Apr 2023 18:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B5=B7=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20=E5=8F=91=E5=B8=83=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkFlowController.java        | 21 +++++++++++++-----
 .../SarBussionessStandController.java         | 22 ++++++++++++++-----
 .../entity/SarBussionessStand.java            |  6 ++++-
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index 3ee690f4..8fcb78f4 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -1135,6 +1135,8 @@ public class WorkFlowController {
             qbfsForm.put("rqbName",data.getRqbName());
             if(StringUtils.isNotBlank(data.getRqbJson())){
                 //通过id去找到代替标准号
+                String fbgBuss ="";
+                String fbgBussName = "";
                 List<EsRevisePlanInfo> objects = new ArrayList<>();
                 SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoDao.selectByIdAtt(data.getRqbJson());
                 if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) {
@@ -1143,14 +1145,23 @@ public class WorkFlowController {
                     for (String fileId : split) {
                         AttFileEO fileInfo = attFileEOService.getFileInfo(fileId);
                         if (fileInfo != null) {
-                            EsRevisePlanInfo esRevisePlanInfo = new EsRevisePlanInfo();
-                            esRevisePlanInfo.setId(fileInfo.getId());
-                            esRevisePlanInfo.setName(fileInfo.getOldFileName());
-                            objects.add(esRevisePlanInfo);
+                            if(StringUtils.isNotBlank(fbgBuss)){
+                                fbgBuss = fbgBuss+","+fileInfo.getId();
+                            }else {
+                                fbgBuss = fileInfo.getId();
+                            }
+
+                            if(StringUtils.isNotBlank(fbgBussName)){
+                                fbgBussName = fbgBussName+","+fileInfo.getId();
+                            }else {
+                                fbgBussName = fileInfo.getId();
+                            }
+
                         }
                     }
                 }
-                qbfsForm.put("fbgbuss",objects);
+                qbfsForm.put("LSBBBUSS",objects);
+                qbfsForm.put("LSBBBUSSName",objects);
             }
             //qbfsForm.put("fbgbussName","");
             qbfsForm.put("rqbCode",data.getRqbCode());
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 a41cccfd..b1b008cc 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
@@ -369,19 +369,29 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
             if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) {
                 String fbgbuss = sarBussStandAttrInfo.getFbgbuss();
                 String[] split = fbgbuss.split(",");
+                String fbgBuss ="";
+                String fbgBussName = "";
                 for (String fileId : split) {
                     AttFileEO fileInfo = attFileEOService.getFileInfo(fileId);
                     if (fileInfo != null) {
-                        EsRevisePlanInfo esRevisePlanInfo = new EsRevisePlanInfo();
-                        esRevisePlanInfo.setId(fileInfo.getId());
-                        esRevisePlanInfo.setName(fileInfo.getOldFileName());
-                        objects.add(esRevisePlanInfo);
+                        if(StringUtils.isNotBlank(fbgBuss)){
+                            fbgBuss = fbgBuss+","+fileInfo.getId();
+                        }else {
+                            fbgBuss = fileInfo.getId();
+                        }
+
+                        if(StringUtils.isNotBlank(fbgBussName)){
+                            fbgBussName = fbgBussName+","+fileInfo.getId();
+                        }else {
+                            fbgBussName = fileInfo.getId();
+                        }
+
                     }
                 }
+                data.setLSBBBUSS(fbgBuss);
+                data.setLSBBBUSSName(fbgBussName);
             }
-            data.setFbgBuss(objects);
         }
-
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
index ccb42a7d..fa3724ec 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
@@ -127,7 +127,11 @@ public class SarBussionessStand extends BaseEntity {
 
     @ApiModelProperty(value = "发布稿名称")
     @TableField(exist = false)
-    private List<EsRevisePlanInfo> fbgBuss;
+    private String LSBBBUSS;
+
+    @ApiModelProperty(value = "发布稿名称")
+    @TableField(exist = false)
+    private String LSBBBUSSName;
 
 
     // 非表字段