From 6411deb8a649d5475a36000c201bbae9af4fbf20 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 15 Jun 2023 11:16:02 +0800
Subject: [PATCH] =?UTF-8?q?add:=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96PDMC?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PDMCSarLawsStandInfoMapper.xml            | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml
index 33225f6f..b6b75787 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml
@@ -18,23 +18,25 @@
     <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo" >
     </resultMap>
     <sql id="Base_Column_List_Show" >
-        DISTINCT sar_standards_info.ID,
-        sar_stand_menu.MENU_ID as MENU_ID,
-        sar_standards_info.STAND_NUMBER as STAND_NUMBER,
-        sar_standards_info.STAND_NAME as STAND_NAME,
-        sar_standards_info.STAND_EN_NAME as STAND_EN_NAME,
-        sar_standards_info.STAND_STATE as TEXT_STATE,
-        sar_standards_info.ISSUE_TIME as ISSUE_TIME,
-        sar_standards_info.REPLACE_STAND_NUM as REPLACE_STAND_NUM,
-        concat('https://srms.foton.com.cn/#/otherStandardDetails/',sar_standards_info.ID,'/',sar_standards_info.STAND_TYPE,'_STAND') as LINK
+        DISTINCT ssi.ID,
+        ssm.MENU_ID as MENU_ID,
+        CONCAT(CASE WHEN ssi.STAND_SORT is NULL THEN '' ELSE ssi.STAND_SORT END,
+				IFNULL(CONCAT(' ', CASE WHEN ssi.STAND_NUMBER='' THEN NULL ELSE ssi.STAND_NUMBER END), ''),
+				IFNULL(CONCAT('-', CASE WHEN ssi.STAND_YEAR='' THEN NULL ELSE ssi.STAND_YEAR END), '')) as STAND_NUMBER,
+        ssi.STAND_NAME as STAND_NAME,
+        ssi.STAND_EN_NAME as STAND_EN_NAME,
+        ssi.STAND_STATE as TEXT_STATE,
+        ssi.ISSUE_TIME as ISSUE_TIME,
+        ssi.REPLACE_STAND_NUM as REPLACE_STAND_NUM,
+        concat('https://srms.foton.com.cn/#/otherStandardDetails/',ssi.ID,'/',ssi.STAND_TYPE,'_STAND') as LINK
     </sql>
 
 
     <select id="getSarStandardsInfo" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List_Show"/>
-        from sar_standards_info
-        left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
+        from sar_standards_info ssi
+        left join sar_stand_menu ssm on ssi.id=ssm.STAND_ID order by ssi.ID asc
     </select>
     <select id="getSarStandardsCount" resultType="java.lang.Integer">
         select