From 7cd3262d3ff8bbba4d84e766e584059df98a16cb Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 5 Dec 2021 19:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandWarning/EarlyWraningEOMapper.xml  | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
index 08718b4e..4c5861f7 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
@@ -85,19 +85,25 @@
     </sql>
 
     <select id="selectWarningPage" resultMap="resultMap">
+        SELECT WARNING_RESULT.* FROM
+        (
+
+
         SELECT
-            <include refid="stand_column"/> ,
-        	attr.CLLX AS APPLY_TYPE ,
-        	attr.ZRGCS AS DUTY_ENGINEER ,
-        	NULL AS ITEMS_ID ,
-        	NULL AS ITEMS_NUM ,
-        	NULL AS  ITEMS_NAME ,
-        	NULL AS POLICY_ID ,
-        	NULL AS POLICY_NAME ,
-        	MARK ,
-        	POWER,
-        	attr.XCXSSRQ AS XCXSSRQ ,
-        	attr.ZCCSSRQ AS ZCCSSRQ
+        <include refid="stand_column"/>
+        ,
+        attr.CLLX AS
+        APPLY_TYPE ,
+        attr
+        .ZRGCS AS DUTY_ENGINEER ,
+        NULL AS ITEMS_ID ,
+        NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
+        NULL AS POLICY_ID ,
+        NULL AS POLICY_NAME ,
+        MARK ,
+        POWER,
+        attr.XCXSSRQ AS XCXSSRQ ,
+        attr.ZCCSSRQ AS ZCCSSRQ
         FROM sar_stand_warning AS warning
         LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID
         LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
@@ -105,8 +111,8 @@
             POWER = '1'
             AND (MARK = 'stand')
             <include refid="stand_where"/>
-            <if test="waringEO.applyType != null and waringEO.applyType != ''">
-               AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%')
+            <if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
+                #{waringEO.applyType},'%')
             </if>
             <if test="waringEO.startXCXSSRQ != null and waringEO.startXCXSSRQ != '' and waringEO.endXCXSSRQ != null and waringEO.endXCXSSRQ != ''">
                AND (
@@ -168,6 +174,15 @@
             </if>
 
         </where>
+        )
+        WARNING_RESULT
+        LEFT JOIN
+        (
+        SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
+        GROUP BY warning_date.law_id
+        ) warning_date
+        ON warning_date.law_id = WARNING_RESULT.STAND_ID
+        ORDER BY warning_date.SSRQ_MIN
 
     </select>