From 464451ab82a07a2e91a229a8628fd89214a2e4f2 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Wed, 17 Nov 2021 11:56:23 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../SarStandardsInfoMapper.xml                | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

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 2bc5e145..7b1aba8f 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
@@ -603,7 +603,7 @@
             when 'HJ' THEN 7
             ELSE 8
             END,
-            sar_standards_info.stand_sort ASC,sar_standards_info.id
+            sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
         </if>
         <if test='page.standType != null and page.standType == "FOREIGN"'>
             CASE sar_standards_info.stand_sort
@@ -633,7 +633,7 @@
             when 'ADR' THEN 23
             ELSE 24
             END,
-            sar_standards_info.stand_sort ASC,sar_standards_info.id
+            sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
         </if>
     </sql>
     <sql id="standSort_out">
@@ -1034,10 +1034,16 @@
             and stand_type = #{standType}
         </if>
         <if test="standNumber != null">
-            and ((concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-            SAR_STANDARDS_INFO.STAND_YEAR) = ( #{standNumber}) and SAR_STANDARDS_INFO.STAND_YEAR != '')
-            or (concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = ( #{standNumber})
-            and SAR_STANDARDS_INFO.STAND_YEAR = '')
+            and (
+                ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
+                and
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
+                and
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
+                and
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
+                and SAR_STANDARDS_INFO.STAND_YEAR = '')
             )
         </if>
         <if test="sychronId != null">
@@ -1137,8 +1143,7 @@
             ${orderByA} ${order1},
         </if>
         <include refid="standSort_out"/>
-        a.issue_time is null
-        ,a.issue_time desc,a.id
+        a.STAND_YEAR DESC,a.id
     </select>
 
     <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">