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 1/2] =?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 2/2] =?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>