From e196e82e5ddeb53a452ea878757e2d9a81200338 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 2 Aug 2022 09:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E7=B2=BE?=
 =?UTF-8?q?=E7=A1=AE=E5=88=B0=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/govproject/ProjectDao.xml          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index 5771dfad79..1b159cb69d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -429,10 +429,10 @@
             DEL_FLAG = '0'
             AND AGENCY_ID = #{agencyId}
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             GRID_ID
@@ -450,10 +450,10 @@
             AND GRID_ID IS NOT NULL
             AND GRID_ID != ''
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             GRID_ID
@@ -471,10 +471,10 @@
                 AND GRID_ID = #{orgId}
             </if>
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             CREATED_BY
@@ -493,10 +493,10 @@
                 AND GRID_ID = #{orgId}
             </if>
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             STAFF_ID
@@ -511,10 +511,10 @@
             DEL_FLAG = '0'
             AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%'))
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             AGENCY_ID
@@ -530,10 +530,10 @@
             AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%'))
             AND OPERATION = 'close'
             <if test="null != startDate and '' != startDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ >= ]]> #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test="null != endDate and '' != endDate">
-                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ <= ]]> #{endDate}
             </if>
         GROUP BY
             AGENCY_ID