From 4d9b3c22cae7fe1b115dc44ceba0b00f1e7eda18 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Wed, 22 Mar 2023 16:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E8=AF=91=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=92=8C=E6=97=A0=E6=B3=95=E5=A4=84=E7=90=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E8=BF=94=E5=9B=9E=EF=BC=88=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E5=92=8C=E6=96=87=E4=BB=B6id=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarBussionessStand/entity/OldSystem.java  |  2 +
 .../entity/OldSystemVo.java                   | 15 ++++++
 .../impl/SarBussionessStandServiceImpl.java   | 54 ++++++++++++++++---
 .../SarStandardsInfoMapper.xml                |  3 +-
 4 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java
index d884980b..bf4657df 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java
@@ -27,6 +27,8 @@ public class OldSystem {
 
     private String fileId;
 
+    private String standNumber;
+
 
     // 需要组合的数据
     private String attFileId;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java
new file mode 100644
index 00000000..3020ce41
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java
@@ -0,0 +1,15 @@
+package com.adc.da.slrs.sarBussionessStand.entity;
+
+import lombok.Data;
+
+@Data
+public class OldSystemVo {
+
+    private String id;
+    //标准号
+    private String standNumber;
+    //译文件
+    private String translateFileId;
+    //原文件
+    private String originalFileId;
+}
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 af3a0f36..16478be7 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
@@ -42,6 +42,7 @@ import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService;
 import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao;
 import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
 import com.adc.da.slrs.sarBussionessStand.entity.OldSystem;
+import com.adc.da.slrs.sarBussionessStand.entity.OldSystemVo;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
@@ -2623,8 +2624,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     public ResponseMessage emptyFileAnewStorage(String type) {
         //数据组合
         List<OldSystem> oldArr = new ArrayList();
-        // 记录无法处理的id
-        Set<String> fileEOArrayList= new HashSet<>();
+        //
+        List<Object> objectList = new ArrayList<>();
+        // 被修改的标准号和文件
+        Set<OldSystemVo> UpdateStandNumberFileList = new HashSet<>();
+        // 无法处理的信息 标准号 和文件id
+        Set<OldSystemVo> cannotModifyStandNumberFileList = new HashSet<>();
         //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文  译文
         if(type.equals("海外")) {
             List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("FOREIGN");
@@ -2764,7 +2769,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                     }
                                                                 }
                                                             }else {
-                                                                fileEOArrayList.add(SarStandardsInfo.getStandId());
+                                                                //记录所有疑问的数据
+                                                                OldSystemVo oldSystemVo = new OldSystemVo();
+                                                                oldSystemVo.setId(SarStandardsInfo.getStandId());
+                                                                oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
+                                                                oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
+                                                                cannotModifyStandNumberFileList.add(oldSystemVo);
                                                             }
 
                                                         }
@@ -2928,7 +2938,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                             }
                                                         }
                                                     }else {
-                                                        fileEOArrayList.add(SarStandardsInfo.getStandId());
+                                                        //记录所有疑问的数据
+                                                        OldSystemVo oldSystemVo = new OldSystemVo();
+                                                        oldSystemVo.setId(SarStandardsInfo.getStandId());
+                                                        oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
+                                                        oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
+                                                        cannotModifyStandNumberFileList.add(oldSystemVo);
                                                     }
 
                                                 }
@@ -2977,6 +2992,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                 if (StringUtils.isNotBlank(yi)) {
                     old.setStandId(SarStandardsInfo.getStandId());
                     oldArr.add(old);
+                    //记录所有修改的数据
+                    OldSystemVo oldSystemVo = new OldSystemVo();
+                    oldSystemVo.setId(SarStandardsInfo.getStandId());
+                    oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
+                    oldSystemVo.setTranslateFileId(yi);
+                    UpdateStandNumberFileList.add(oldSystemVo);
                 }
             }
             //海外
@@ -2987,7 +3008,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                     logger.info("海外修改成功=====================================================================================");
                 }
             }
-
         }
         if(type.equals("国内")) {
             List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND");
@@ -3127,7 +3147,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                 }
                                                             }
                                                         }else {
-                                                            fileEOArrayList.add(SarStandardsInfo.getStandId());
+                                                            //记录所有疑问的数据
+                                                            OldSystemVo oldSystemVo = new OldSystemVo();
+                                                            oldSystemVo.setId(SarStandardsInfo.getStandId());
+                                                            oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
+                                                            oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
+                                                            cannotModifyStandNumberFileList.add(oldSystemVo);
                                                         }
 
                                                     }
@@ -3291,7 +3316,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                         }
                                                     }
                                                 }else {
-                                                    fileEOArrayList.add(SarStandardsInfo.getStandId());
+                                                    //记录所有疑问的数据
+                                                    OldSystemVo oldSystemVo = new OldSystemVo();
+                                                    oldSystemVo.setId(SarStandardsInfo.getStandId());
+                                                    oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
+                                                    oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
+                                                    cannotModifyStandNumberFileList.add(oldSystemVo);
                                                 }
 
                                             }
@@ -3340,6 +3370,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                 if (StringUtils.isNotBlank(yi)) {
                     old.setStandId(SarStandardsInfo.getStandId());
                     oldArr.add(old);
+                    //记录所有修改的数据
+                    OldSystemVo oldSystemVo = new OldSystemVo();
+                    oldSystemVo.setId(SarStandardsInfo.getStandId());
+                    oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
+                    oldSystemVo.setTranslateFileId(yi);
+                    UpdateStandNumberFileList.add(oldSystemVo);
                 }
             }
             //国内
@@ -3717,7 +3753,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 //            }
             logger.info("企业没有译文件");
         }
-        return Result.success(fileEOArrayList);
+        objectList.add(UpdateStandNumberFileList);
+        objectList.add(cannotModifyStandNumberFileList);
+        return Result.success(objectList);
     }
 
     public String isTheSame (String oldFileName,String buildId){
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 ab83b51d..84e3b2d4 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
@@ -1892,10 +1892,11 @@
         SELECT
         std.id as 'standId',
         std.BUILD_ID as 'buildId',
+        std.STAND_NUMBER as 'standNumber',
         att.id as 'attfid',
         att.FBGBJBD as 'fileId'
         from sar_standards_info std
-        left JOIN sar_stand_attr_info att    on std.id = att.STAND_ID
+        left JOIN sar_stand_attr_info att on std.id = att.STAND_ID
         where std.BUILD_ID is not null
         and att.FBGBJBD is not null
         <if test="type != null">