From fe0a0f7dbe8b56b83a9d67ef32c8ec2e129ccb6a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Sep 2021 20:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=20=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=8E=92=E5=BA=8F=20?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8=20group=20by=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 8fb675bc..3744e28e 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -595,7 +595,7 @@
         ) AS issueTime
         from SAR_STANDARDS_INFO
         <include refid="SarStandardsInfo_Where_Clause"/>
-        GROUP BY <include refid="Group_Column_List_Show"/>,CHJL,SAR_STAND_ATTR_INFO.XCXSSRQ,SAR_STAND_ATTR_INFO.ZCCSSRQ
+        GROUP BY <include refid="Group_Column_List_Show"/>,CHJL,SAR_STAND_ATTR_INFO.XCXSSRQ,SAR_STAND_ATTR_INFO.ZCCSSRQ,SAR_STAND_ATTR_INFO.SSRQ
         order by
         ${orderBy1} ${order1},SAR_STANDARDS_INFO.id
         ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
@@ -652,6 +652,11 @@
         FROM sar_standards_info
         LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
         WHERE
+        DATE_FORMAT(ssai.SSRQ, '%Y-%m-%D') >= DATE_FORMAT(
+        SAR_STANDARDS_INFO.ISSUE_TIME,
+        '%Y-%m-%D'
+        )
+        AND
         sar_standards_info.VALID_FLAG='0'
         AND TEXT_STATUS=#{typeCode}
         ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC