From 6eb0ed526e86e54ca4e802b3eca5166ab23b54d8 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Wed, 4 Aug 2021 20:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E4=B8=AD=E2=80=9C=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=BC=96=E5=8F=B7=E2=80=9D=E5=AD=97=E6=AE=B5=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9C=E6=A0=87=E5=87=86=E5=8F=B7",=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8F=B7=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListMapper.xml                      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index 4758cd0b..72ceb57f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -6,8 +6,9 @@
         SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
                b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
                a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
-        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
-        a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
+        FROM sar_standards_info a
+            LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
+            left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
         dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
         <where>
             <if test="sarFindDto.standName != null">
@@ -46,7 +47,7 @@
     </select>
 
     <select id="selectLawsByIdE" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT a.ID, CONCAT(dicstandSort.DIC_TYPE_NAME," ", a.STAND_NUMBER, "-", a.STAND_YEAR) AS standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
         b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
         a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on