From da97a6071693f688f180227f35f4d8338a9ea012 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 30 Nov 2021 17:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListServiceImpl.java   |  2 +-
 .../SarLawsAttrDetailedListMapper.xml         | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
index 8c1e51c7..ea61ac36 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
@@ -43,7 +43,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         IPage<SarLawsAttrDetailedList> pageRes = new Page<>(sarFindDto.getPage(), sarFindDto.getSize());
         QueryWrapper<SarLawsAttrDetailedList> wrapper = new QueryWrapper<>();
         wrapper.eq("detailed_list_id", sarFindDto.getId());
-        IPage<SarLawsAttrDetailedList> selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper);
+        IPage<SarLawsAttrDetailedList> selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper);  //??????
         //查询标准id
         List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto);
         if (CollectionUtils.isEmpty(lawsIds)){
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 17fe6030..66bd900a 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
@@ -44,6 +44,86 @@
                 #{item}
             </foreach>
         </where>
+        UNION ALL
+
+        SELECT
+        a.ID,
+        a.STAND_CODE AS standNumber,
+        a.STAND_NAME AS standName,
+        a.STAND_EN_NAME,
+        b.NYLXCLASS,
+        null AS SSRQ,
+        null AS XCXSSRQGJ,
+        null AS ZCCSSRQGJ,
+        null as ZRBM,
+        null as SYCPX,
+        null as CYCVPPSBM,
+        null as CYCVPPSCN,
+        null as KCCVPPSBM,
+        null as KCCVPPSCN,
+        null as typeApplicable,
+        dicstandSort.DIC_TYPE_NAME AS standSortShow,
+        null as  standYear,
+        null as issueTime,
+        null asstandType,
+        null AS textStatus
+        FROM
+        sar_bussioness_stand a
+        LEFT JOIN sar_buss_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>
+            a.ID IN
+            <foreach collection="param1" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+
+        UNION ALL
+
+        SELECT
+        a.ID,
+        a.LAWS_NUMBER AS standNumber,
+        a.LAWS_NAME AS standName,
+        a.LAWS_EN_NAME as STAND_EN_NAME,
+        b.NYLXLAWS,
+        b.SSRQLAWS AS SSRQ,
+        b.XCXSSRQLAWS AS XCXSSRQGJ,
+        b.ZCXSSRQLAWS AS ZCCSSRQGJ,
+        b.ZRBMLAWS as ZRBM,
+        null as SYCPX,
+        null as CYCVPPSBM,
+        null as CYCVPPSCN,
+        null as KCCVPPSBM,
+        null as KCCVPPSCN,
+        null as typeApplicable,
+        dicstandSort.DIC_TYPE_NAME AS standSortShow,
+        a.LAWS_YEAR as  standYear,
+        a.ISSUE_TIME as issueTime,
+        null asstandType,
+        null AS textStatus
+        FROM
+        sar_laws_stand_info a
+        LEFT JOIN sar_laws_attr_info b ON a.ID = b.LAWS_ID
+        LEFT JOIN TS_DICTYPE dicstandSort ON (
+        dicstandSort.dic_type_code = a.LAWS_TYPE
+        AND dicstandSort.dic_id IS NOT NULL
+        AND dicstandSort.valid_flag = 0
+        AND dicstandSort.PARENT_ID IS NULL
+        )
+        <where>
+            a.ID IN
+            <foreach collection="param1" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+
+
+
     </select>
 
     <select id="selectLawsByIdE" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">