From 8d0c95125e68633af9311f0c8ecafd6417d06b6c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 7 Jun 2021 14:26:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E3=80=91=E9=A6=96=E9=A1=B5=E6=80=BB=E6=95=B0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=BF=9190=E5=A4=A9=E7=9A=84=E6=95=B0=E6=8D=AE-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2021-06-07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/events/EpdcEventsDao.xml           | 1 +
 .../src/main/resources/mapper/issue/IssueDao.xml                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index e047cd97d..6710ca41b 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -318,6 +318,7 @@
         <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        and date_format( CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
     </select>
 
     <resultMap id="pendingResponseMap" type="com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO">
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index c505b9a8e..2e62cc43b 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -500,6 +500,7 @@
         <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        and date_format( CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
     </select>
 
     <resultMap id="workIssueList" type="com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO">

From 22b49ead7ba4196eb0d83812e5033396a1b58669 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 7 Jun 2021 17:56:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E3=80=91=E9=A6=96=E9=A1=B5=E6=80=BB=E6=95=B0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?-=E5=BE=85=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91-=E8=BF=9190?=
 =?UTF-8?q?=E5=A4=A9=E7=9A=84=E6=95=B0=E6=8D=AE-=E7=8E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=B3=B0-2021-06-07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-user-server/src/main/resources/mapper/UserDao.xml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index c82ef1003..086b09f06 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -337,6 +337,7 @@
         FROM
         epdc_user u
         where  u.DEL_FLAG = '0'
+        and date_format( u.CREATED_TIME, '%Y-%m-%d' ) > date_format( date_add( now( ), INTERVAL - 90 day), '%Y-%m-%d' )
         <choose>
             <when test="gridId != null and gridId > 0">AND u.DEPT_ID = #{gridId}</when>
             <otherwise>