From da7826f004a742840cbbd693570cab318530164d Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 4 Sep 2021 10:07:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=81=E6=A0=87excl=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/utils/util/BussStandExportUtil.java    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
index 0e8f8207..aadd47a0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
@@ -9,6 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -105,10 +106,14 @@ public class BussStandExportUtil {
                 value = sarStandardsInfoEO.getStandStatusShow();
                 break;
             case "标准实施日期":
-                if (sarStandardsInfoEO.getPutTime() != null) {
-                    String issueTime = sdf.format(sarStandardsInfoEO.getPutTime());
-                    value = issueTime;
+                String putTime="";
+                if (Date.class.equals(sarStandardsInfoEO.getPutTime())) {
+                    putTime = sdf.format(sarStandardsInfoEO.getPutTime());
+
+                }else {
+                    putTime=sarStandardsInfoEO.getPutTime();
                 }
+                value = putTime;
                 break;
             case "代替企标编号":
                 value = sarStandardsInfoEO.getReplaceStandNum();
@@ -117,10 +122,13 @@ public class BussStandExportUtil {
                 value = sarStandardsInfoEO.getReplacedStandNum();
                 break;
             case "发布日期":
-                if (sarStandardsInfoEO.getIssueTime() != null) {
-                    String issueTime = sdf.format(sarStandardsInfoEO.getIssueTime());
-                    value = issueTime;
+                String issueTime="";
+                if (Date.class.equals(sarStandardsInfoEO.getIssueTime().getClass())){
+                     issueTime = sdf.format(sarStandardsInfoEO.getIssueTime());
+                }else {
+                    issueTime=sarStandardsInfoEO.getIssueTime();
                 }
+                value = issueTime;
                 break;
             case "复审日期":
                 String field1 = attrInfoMap.get(name);

From 19c52a212b0f84d3e4d1ed7cdae608651d3ed0a7 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 4 Sep 2021 10:09:40 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2,putTime,issuTime,textStatu?=
 =?UTF-8?q?sBuss=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SarBussionessStandEOPage.java              | 10 ++++++++++
 .../sarBussionessStand/SarBussionessStandMapper.xml   | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
index a2263387..1ecd984c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
@@ -12,6 +12,16 @@ import java.util.List;
  */
 public class SarBussionessStandEOPage extends BasePage {
 
+    private String textStatusBuss;
+
+    public String getTextStatusBuss() {
+        return textStatusBuss;
+    }
+
+    public void setTextStatusBuss(String textStatusBuss) {
+        this.textStatusBuss = textStatusBuss;
+    }
+
     private String modifyTime;
     private String modifyTime1;
     private String modifyTime2;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index 0aecf221..93d64a17 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -363,6 +363,17 @@
         left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0)
         where 1=1
         <trim suffixOverrides="," >
+
+            <if test="putTime!=null">
+                and put_time=#{putTime}
+            </if>
+            <if test="issueTime!=null">
+                and issue_time=#{issueTime}
+            </if>
+            <if test="textStatusBuss!=null">
+                and text_status_buss=#{textStatusBuss}
+            </if>
+
             <if test="standCode != null" >
                 <!-- and (
                 (concat(dicstandSort.DIC_TYPE_NAME, ' ', SAR_BUSSIONESS_STAND.STAND_CODE, '-', SAR_BUSSIONESS_STAND.STAND_YEAR)

From 28e8ba6c88e47cc8a57a1a1d2bac84dc0f4214e1 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 4 Sep 2021 10:16:19 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=87=BAexcl=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81->=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/adc/da/utils/util/BussStandExportUtil.java    | 2 +-
 .../src/main/java/com/adc/da/utils/util/FieldConvertUtil.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
index aadd47a0..6002aa1f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
@@ -102,7 +102,7 @@ public class BussStandExportUtil {
             case "英文名称":
                 value = sarStandardsInfoEO.getStandEnName();
                 break;
-            case "标准状态":
+            case "文本状态":
                 value = sarStandardsInfoEO.getStandStatusShow();
                 break;
             case "标准实施日期":
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
index e0966339..4895a277 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
@@ -51,7 +51,7 @@ public class FieldConvertUtil {
             "个性化标签,政策文本,过程稿件,新车型实施日期（文本）,在产车实施日期（文本）,EOP实施日期（文本）,SVPPS," +
             "相关部门,责任部门,FO,维护工程师,归口管理部门,发布机构,我司是否参与,相关资料";
 
-    public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,标准状态,发布日期,标准实施日期," +
+    public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,标准实施日期," +
             "代替企标编号,被代替企标编号";
 
     public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," +

From 2e83db6d981c01321e98e8ff4b75c60be29f5a1c Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 4 Sep 2021 15:07:15 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A2=AB=E4=BB=A3=E6=9B=BF,=E5=BA=9F?=
 =?UTF-8?q?=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/scheduled/ScheduledJob.java    | 82 ++++++++++++-------
 1 file changed, 51 insertions(+), 31 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
index 6664c6bb..879088f3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
@@ -13,6 +13,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
@@ -21,9 +22,9 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @EnableScheduling
 @Component
@@ -173,8 +174,8 @@ public class ScheduledJob {
     /**
      * 定时更新文本状态
      */
-    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
-//    @Scheduled(cron="*/5 * * * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void TextStatusSchedulingTasks() {
         QueryWrapper<SarStandardsInfo> wrapper = new QueryWrapper<>();
@@ -205,37 +206,56 @@ public class ScheduledJob {
 
 
         /**
-         * 被多个标准代替的标准变为“被代替”，只有一个被代替的自动变为“废止”
+         * 被多个标准代替的标准变为“被代替”，只被一个标准代替的自动变为“废止”
          */
-        QueryWrapper<SarStandAttrInfo> columns = new QueryWrapper<>();
-        columns.select("DTBJH","STAND_ID");
-        List<Map<String, Object>> mapsDTBZH = sarStandAttrInfoDao.selectMaps(columns);
+        QueryWrapper<SarStandardsInfo> columns = new QueryWrapper<>();
 
-        mapsDTBZH.forEach(item->{
-            if (item.get("DTBJH")!=null && !item.get("DTBJH").toString().equals("")){
-                String dtbzh = item.get("DTBJH").toString();
-                String[] split = dtbzh.split(",");
-                SarStandardsInfo sarStandardsInfo = new SarStandardsInfo();
-                sarStandardsInfo.setId(item.get("STAND_ID").toString());
+        columns.select("REPLACE_STAND_NUM");
+        //查询代替标准字段得到一个 被代替了的标准的id的键值对列表
+        List<Map<String, Object>> replaceStandIdMaps = sarStandardsInfoDao.selectMaps(columns);
+        HashMap<String, Integer> replaceIdCountMap = new HashMap<>();
 
-                //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态
-                switch (split.length){
-                    case 0 :
-                        break;
-                    case 1 :
-                        sarStandardsInfo.setTextStatus("chblaarg77");//废止状态
-                        break;
-                    default:
-                        sarStandardsInfo.setTextStatus("qke0ckro2p");//被代替状态
-                }
-                try {
-                    sarStandardsInfoDao.updateById(sarStandardsInfo);
-                }catch (Exception e){
-                    System.out.println("代替标准状态更新:id为"+item.get("STAND_ID").toString()+"文本状态更新失败");
-                }
+       replaceStandIdMaps.forEach(item->{
+           if (item!=null){
+                //此标准代替的标准的id数组
+               String[] standIds = item.get("REPLACE_STAND_NUM").toString().split(",");
+               for (String standId : standIds) {
+
+                   //如果代替标准id已存在则映射为2不存在则添加并映射为1
+                   if (replaceIdCountMap.containsKey(standId)) {
+                       replaceIdCountMap.replace(standId,2);
+                   }else {
+                       replaceIdCountMap.put(standId, 1);
+                   }
+               }
+
+           }
+
+       });
+
+
+        //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态
+        SarStandardsInfo sarStandardsInfo = new SarStandardsInfo();
+        for (String key : replaceIdCountMap.keySet()) {
+            switch (replaceIdCountMap.get(key)){
+                case 1 :
+                    sarStandardsInfo.setTextStatus("chblaarg77");//废止状态
+                    sarStandardsInfo.setId(key);
+                    break;
+                default :
+                    sarStandardsInfo.setTextStatus("qke0ckro2p");//被代替状态
+                    sarStandardsInfo.setId(key);
+                    break;
             }
 
-        });
+
+            try {
+                sarStandardsInfoDao.updateById(sarStandardsInfo);
+            }catch (Exception e){
+                System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败");
+            }
+        }
+
 
     }
 }

From 75ef2d52bc6dde7b049d7f49992668441f6536eb Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 4 Sep 2021 22:29:15 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A2=AB=E4=BB=A3=E6=9B=BF,=E5=BA=9F?=
 =?UTF-8?q?=E6=AD=A2=E6=A0=B9=E6=8D=AE=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/scheduled/ScheduledJob.java    | 65 +++++++++++++------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
index 879088f3..30e91190 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
@@ -12,6 +12,7 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.sun.corba.se.spi.ior.iiop.IIOPFactories;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -174,8 +175,8 @@ public class ScheduledJob {
     /**
      * 定时更新文本状态
      */
-//    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
-    @Scheduled(cron="*/5 * * * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+//    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void TextStatusSchedulingTasks() {
         QueryWrapper<SarStandardsInfo> wrapper = new QueryWrapper<>();
@@ -208,30 +209,56 @@ public class ScheduledJob {
         /**
          * 被多个标准代替的标准变为“被代替”，只被一个标准代替的自动变为“废止”
          */
-        QueryWrapper<SarStandardsInfo> columns = new QueryWrapper<>();
+        QueryWrapper<SarStandAttrInfo> columnForDTBJH = new QueryWrapper<>();
 
-        columns.select("REPLACE_STAND_NUM");
+        columnForDTBJH.select("DTBJH");
         //查询代替标准字段得到一个 被代替了的标准的id的键值对列表
-        List<Map<String, Object>> replaceStandIdMaps = sarStandardsInfoDao.selectMaps(columns);
+        List<Map<String, Object>> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH);
         HashMap<String, Integer> replaceIdCountMap = new HashMap<>();
 
-       replaceStandIdMaps.forEach(item->{
-           if (item!=null){
-                //此标准代替的标准的id数组
-               String[] standIds = item.get("REPLACE_STAND_NUM").toString().split(",");
-               for (String standId : standIds) {
 
-                   //如果代替标准id已存在则映射为2不存在则添加并映射为1
-                   if (replaceIdCountMap.containsKey(standId)) {
-                       replaceIdCountMap.replace(standId,2);
-                   }else {
-                       replaceIdCountMap.put(standId, 1);
-                   }
-               }
+            replaceStandIdMaps.forEach(item->{
+                if (item!=null){
+                    //此标准代替的标准的标准号的数组
+                    String DTBJHStr = item.get("DTBJH").toString();
+                    if (!DTBJHStr.equals("")){
+                        String[] DTBJHArray = DTBJHStr.split(",");
+                        for (String DTBJH : DTBJHArray) {
+                            String[] sortOrNumberAndYear = DTBJH.split("\\s+");
+                            String sort = sortOrNumberAndYear[0];
+
+                            String[] numberOrYear = sortOrNumberAndYear[1].split("\\-");
+                            String number=numberOrYear[0];
+                            String year=numberOrYear[1];
+
+                            QueryWrapper<SarStandardsInfo> infoWrapper = new QueryWrapper<>();
+                            infoWrapper.select("ID")
+                                    .eq("STAND_SORT",sort)
+                                    .eq("STAND_NUMBER",number)
+                                    .eq("STAND_YEAR",year);
+
+
+                            List<Map<String, Object>> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper);
+                            String standId = idMaps.get(0).get("ID").toString();
+
+                            //如果代替标准id已存在则映射为2不存在则添加并映射为1
+                            if (replaceIdCountMap.containsKey(standId)) {
+                                replaceIdCountMap.replace(standId,2);
+                            }else {
+                                replaceIdCountMap.put(standId, 1);
+                            }
+                        }
+
+                    }
+
+
+
+
+                }
+
+            });
 
-           }
 
-       });
 
 
         //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态

From cee53b3df00ad8ca6f2dd17a6fb3ffa0a2575355 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 4 Sep 2021 22:32:14 +0800
Subject: [PATCH 6/6] commit

---
 .../src/main/java/com/adc/da/scheduled/ScheduledJob.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
index 30e91190..56419203 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
@@ -221,6 +221,8 @@ public class ScheduledJob {
                 if (item!=null){
                     //此标准代替的标准的标准号的数组
                     String DTBJHStr = item.get("DTBJH").toString();
+
+                    //数据格式: (GB 123-2000,GB 4233434-2021,GB 423423423-2021)
                     if (!DTBJHStr.equals("")){
                         String[] DTBJHArray = DTBJHStr.split(",");
                         for (String DTBJH : DTBJHArray) {