From 658d83e47e0838727230771e4cca2efffff588dc Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Fri, 12 Aug 2022 14:16:41 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?=
 =?UTF-8?q?6968=20=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=861589=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=B2=A1=E6=94=B9=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarBussionessStand/SarBussionessStandMapper.xml       | 1 +
 .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml   | 1 +
 2 files changed, 2 insertions(+)

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 f0a7d48e..0bb01089 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
@@ -386,6 +386,7 @@
         <if test="pager.orderCondition != null and pager.orderCondition != ''" >
             ${pager.orderCondition}
         </if>
+        order by SAR_BUSSIONESS_STAND.stand_year desc
     </select>
 
     <select id="queryByBussStateSync" resultMap="BaseResultMap"
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 f088607f..15687b2d 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
@@ -1565,6 +1565,7 @@
         <if test="sychronId != null">
             and id != #{sychronId}
         </if>
+        order by SAR_STANDARDS_INFO.stand_year desc
     </select>
 
     <select id="queryStandInfoByList" resultMap="BaseResultMap">

From f14a6f2c62a546c5861daa33aa331854aa2b16bf Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 16 Aug 2022 17:01:10 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/SarPublicIdeaServiceImpl.java        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index 319c4ef4..e5351209 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -48,22 +48,26 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         QueryWrapper<SarPublicIdea> list = new QueryWrapper<>();
         if ("1".equals(type)) {
             if (start!=null && end !=null){
+                String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
+                String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .ge(start != null, "start_time", start)
-                        .le(end != null, "end_time", end)
+                        .ge(start != null, "start_time", date1)
+                        .le(end != null, "end_time", date2)
                         .orderByDesc("start_time");
             }else if (start!=null){
+                String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .le(start != null, "start_time", start)
-                        .ge(start != null, "end_time", start)
+                        .le(start != null, "start_time", date1)
+                        .ge(start != null, "end_time", date1)
                         .orderByDesc("start_time");
             }else if (end!=null){
+                String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .le(end != null, "start_time", end)
-                        .ge(end != null, "end_time", end)
+                        .le(end != null, "start_time", date2)
+                        .ge(end != null, "end_time", date2)
                         .orderByDesc("start_time");
             }else {
                 list.like(StringUtils.isNotEmpty(category), "category", category)
@@ -71,9 +75,10 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
                         .orderByDesc("start_time");
             }
         } else {
+            String date = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
             list.like(StringUtils.isNotEmpty(category), "category", category)
                     .like(StringUtils.isNotEmpty(cname), "cname", cname)
-                    .ge("end_time", new Date())
+                    .ge("end_time", date)
                     .orderByAsc("end_time");
         }
         Page<SarPublicIdea> page = new Page<>(p, size);

From 293f1f1471a508bdfdd5ecc10051d9448a2f2569 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 17 Aug 2022 16:25:54 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=205699?=
 =?UTF-8?q?6=20=E5=9F=BA=E7=A1=80=E5=BA=93=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=98=E6=9B=B4=E4=B9=8B=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandardsInfoServiceImpl.java                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 331cbcc8..d7be73ee 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -2123,6 +2123,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         map.put("standEnName", verifyObj(sarStandardsInfoEO.getStandEnName()));
         map.put("standNature", verifyObj(sarStandardsInfoEO.getStandNature()));
         map.put("standState", verifyObj(sarStandardsInfoEO.getStandState()));
+        map.put("textStatus", verifyObj(sarStandardsInfoEO.getTextStatus()));
 //        if (sarStandardsInfoEO.getIssueTime() != null) {
 //            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 //            String issueStr = format.format(sarStandardsInfoEO.getIssueTime());

From 0005b8aa6ee9cb480f92ceab37b935bacc82c7b5 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 17 Aug 2022 16:36:13 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?=
 =?UTF-8?q?6994=20=E5=88=86=E6=8E=A5=E5=8D=95=E6=89=8B=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E4=B9=8B=E5=90=8E=E6=9D=A1=E6=AC=BE=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/SarStandItems/SarStandItemsMapper.xml       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
index f8519a77..a333b0fc 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
@@ -407,13 +407,13 @@
 
     <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
             parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
-            SELECT
-            sar_stand_items.*
-            FROM
-	            sar_stand_items
+        SELECT
+        sar_stand_items.*,split_pid(sar_stand_items.ITEMS_NUM,'.') as tt
+        FROM
+        sar_stand_items
         <include refid="sarItemWhere"/>
         <if test="orderBy !=null and orderBy!=''">
-            order by sar_stand_items.ITEMS_NUM ${order}
+            order by tt ${order}
         </if>
         LIMIT ${pager.startIndex-1},${pageSize}
     </select>

From bc1158177008b1b7d058a3af618e296bc0d11119 Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Thu, 18 Aug 2022 13:40:58 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E7=A6=8F=E7=94=B0AWC=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3=E4=B8=ADVPPS?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=8F=AA=E8=AF=86=E5=88=AB=E5=88=B0=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StandDataServiceImpl.java    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
index 9a892684..e6754377 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
@@ -36,6 +36,11 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> i
     public String searchStandData(SearchStandContext searchStandContext){
         List<FileResult> fileResultList = new ArrayList<>();
         try {
+            //TODO 此处接口优化  传入的VPPSCode 参数全部截取到第三位位置
+            logger.info("接口传递的VPPS编码为"+searchStandContext.getVppsCode());
+            String newVppsCode= convertVppsCode(searchStandContext.getVppsCode());
+            logger.info("经过处理后只获取前三级的VPPS编码为"+newVppsCode);
+            searchStandContext.setVsgCode(newVppsCode);
             List<StandData> standDataQuery = this.baseMapper.searchStandData(searchStandContext);
            if(!standDataQuery.isEmpty()){
                // 重组数据集合 只需documentName 及 documentUrl
@@ -72,4 +77,23 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> i
         }
         return str;
     }
+
+    private String convertVppsCode(String vppsCode){
+        if(StringUtils.isNotBlank(vppsCode)){
+            String[] splitData = vppsCode.split(".");
+            if(splitData.length<=3){
+                return vppsCode;
+            }else{
+                StringBuilder result = new StringBuilder();
+                result.append(splitData[0]).append(".").append(splitData[1]).append(".").append(splitData[2]);
+                return result.toString();
+            }
+
+
+        }else{
+            return null;
+        }
+    }
+
+
 }