From 24b28c40758e03e9ef372502fa29d9072b7c909b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:43:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
index d9a0ee3..2a78a57 100644
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
+++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
@@ -232,7 +232,7 @@
</resultMap>
<select id="getCountForRPCByDeptIdAndMonth" resultMap="accidentReportCountRPC">
SELECT
- DATE_FORMAT( a.gmt_create, '%Y-%m' ) as time,
+ DATE_FORMAT( a.gmt_create, '%m' ) as time,
a.accident_level AS `level`,
count( 0 ) AS num,
sum( a.economic_loss ) AS economicLoss,
@@ -249,12 +249,13 @@
AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
GROUP BY
DATE_FORMAT( a.gmt_create, '%Y-%m' ),
- a.accident_level
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%m' )
</select>
<select id="getCountForRPCByDeptIdAndDay" resultMap="accidentReportCountRPC">
SELECT
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ) as time,
+ DATE_FORMAT( a.gmt_create, '%d' ) as time,
a.accident_level AS `level`,
count( 0 ) AS num,
sum( a.economic_loss ) AS economicLoss,
@@ -271,6 +272,7 @@
AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
GROUP BY
DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
- a.accident_level
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%d' )
</select>
</mapper>
--
Gitblit v1.9.2