Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!574

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());

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>