From 509e68b6d50a96cc6392adff9f59913466f539e9 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 5 Jan 2022 10:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=97=A5=E6=9C=9F=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarStandWarning/EarlyWraningEOMapper.xml        | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 165cf244..e8abcc3b 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
@@ -191,7 +191,7 @@
         APPLY_TYPE ,
         attr
         .ZRGCS AS DUTY_ENGINEER ,
-        NULL AS ITEMS_ID ,
+        ITEMS_ID ,
         NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
         NULL AS POLICY_ID ,
         NULL AS POLICY_NAME ,
@@ -273,10 +273,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
 
     </select>