From 1b2c595f50b9186e1f4e6dec817eed8789b820b8 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 10 Jan 2022 20:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarStandWarning/EarlyWraningEOMapper.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 df21aa40..494904e7 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
@@ -112,10 +112,11 @@
         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
-        LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =attr.CLLX
+        LEFT JOIN ts_dictype as dicType on (attr.CLLX = dicType.DIC_TYPE_CODE   AND attr.CLLX !=null AND attr.CLLX != '')
         <where>
             POWER = '1'
             AND (MARK = 'stand')
+            AND sarInfo.VALID_FLAG='0'
             <if test="idList != null and idList.size() > 0">
                 AND
                 warning.ID
@@ -148,12 +149,13 @@
         FROM
         sar_stand_warning AS warning
         LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
-        LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID
+        LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEMS_ID
         LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
-        LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =items.APPLY_ARCTIC
+        LEFT JOIN ts_dictype as dicType on (dicType.DIC_TYPE_CODE = items.APPLY_ARCTIC  AND items.APPLY_ARCTIC !=null AND items.APPLY_ARCTIC != '')
         <where>
             POWER = '1'
             AND (MARK = 'item')
+            AND sarInfo.VALID_FLAG='0'
             <if test="idList != null and idList.size() > 0">
                 AND
                 warning.ID
@@ -169,10 +171,11 @@
         WARNING_RESULT
         LEFT JOIN
         (
-        SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
-        GROUP BY warning_date.law_id
+        SELECT item_id,law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
+        GROUP BY warning_date.law_id,item_id
         ) warning_date
         ON warning_date.law_id = WARNING_RESULT.STAND_ID
+        AND warning_date.item_id = WARNING_RESULT.ITEMS_ID
         ORDER BY warning_date.SSRQ_MIN