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 0ac94cda0..296e71009 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
@@ -321,7 +321,7 @@
SELECT #{item} AS deptId
- LEFT JOIN epdc_events ev ON ev.GRID_ID = dept.deptId AND ev.CREATED_TIME BETWEEN #{startDate} AND #{endDate}
+ LEFT JOIN epdc_events ev ON ev.GRID_ID = dept.deptId AND ev.CREATED_TIME BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
WHERE
ev.DEL_FLAG = '0' OR ev.DEL_FLAG IS NULL
GROUP BY dept.deptId
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 160a49943..482540c07 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
@@ -814,7 +814,7 @@
SELECT #{item} AS deptId
- LEFT JOIN epdc_item ei ON ei.GRID_ID = dept.deptId AND ei.CREATED_TIME BETWEEN #{startDate} AND #{endDate}
+ LEFT JOIN epdc_item ei ON ei.GRID_ID = dept.deptId AND ei.CREATED_TIME BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
WHERE ei.DEL_FLAG = '0' OR ei.DEL_FLAG IS NULL
GROUP BY dept.deptId
@@ -829,7 +829,7 @@
SELECT #{deptId} AS deptId
- LEFT JOIN epdc_item_evaluate_dept ed ON dept.deptId = ed.DEPT_ID AND ed.CREATED_TIME BETWEEN #{startDate} AND #{endDate}
+ LEFT JOIN epdc_item_evaluate_dept ed ON dept.deptId = ed.DEPT_ID AND ed.CREATED_TIME BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
WHERE
ed.DEL_FLAG = '0' OR ed.DEL_FLAG IS NULL
GROUP BY dept.deptId
@@ -845,7 +845,7 @@
SELECT #{deptId} AS deptId
LEFT JOIN epdc_item_dept ed ON ed.DEPT_ID = dept.deptId
- AND DATE_FORMAT( ed.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{metaDataFormDto.startDate} AND #{metaDataFormDto.endDate}
+ AND ed.CREATED_TIME BETWEEN #{metaDataFormDto.startDate} AND DATE_ADD(#{metaDataFormDto.endDate},INTERVAL 1 DAY)
AND ed.DEL_FLAG = '0'
GROUP BY dept.deptId
@@ -861,7 +861,7 @@
SELECT #{deptId} AS deptId
LEFT JOIN epdc_item_dept ed ON dept.deptId = ed.DEPT_ID
- AND DATE_FORMAT( ed.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startDate} AND #{endDate}
+ AND DATE_FORMAT( ed.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startDate} AND DATE_ADD(#{endDate},INTERVAL 1 DAY)
AND ed.DEL_FLAG = '0'
LEFT JOIN epdc_item ei ON ed.ITEM_ID = ei.ID
LEFT JOIN epdc_category ec ON ei.CATEGORY_CODE = ec.id