From b972870147cee68ac527d36b4ce8d4da73f32a09 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 25 Oct 2022 20:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=9F=E8=AE=A1=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=88=AA=E8=87=B3=E6=98=A8=E5=A4=A9?=
=?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mapper/item/ItemDao.xml | 66 ++++++++++++++-----
1 file changed, 48 insertions(+), 18 deletions(-)
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 4b3ce3cbd..e5b7296ce 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -1095,9 +1095,14 @@
WHERE item.DEL_FLAG = '0'
and item.IS_PEOPLE = '1'
and item.IS_DIFFICULTY = '1'
-
- AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) DATE_FORMAT(date_sub(now(),interval 1 day),'%Y-%m-%d')
+
+
AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
@@ -2707,9 +2712,14 @@
and item.EVENT_ID is null
and item.ISSUE_ID is null
and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
-
- AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) DATE_FORMAT(date_sub(now(),interval 1 day),'%Y-%m-%d')
+
+
AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
@@ -2732,9 +2742,14 @@
and item.ISSUE_ID is null
and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',2) != '城市综合'
-
- AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) DATE_FORMAT(date_sub(now(),interval 1 day),'%Y-%m-%d')
+
+
AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
@@ -2761,9 +2776,14 @@
and item.EVENT_ID is null
and item.ISSUE_ID is null
and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
-
- AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) DATE_FORMAT(date_sub(now(),interval 1 day),'%Y-%m-%d')
+
+
AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
@@ -2789,9 +2809,14 @@
and item.EVENT_ID is null
and item.ISSUE_ID is null
and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
-
- AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) DATE_FORMAT(date_sub(now(),interval 1 day),'%Y-%m-%d')
+
+
AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
@@ -2820,9 +2845,14 @@
and item.EVENT_ID is null
and item.ISSUE_ID is null
and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
-
- AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
-
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+
+
+ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) DATE_FORMAT(date_sub(now(),interval 1 day),'%Y-%m-%d')
+
+
AND find_in_set(#{deptId},item.ALL_DEPT_IDS)