From 21e7d491658dbd969adbcf0bc2f13a5d563ab863 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Thu, 25 Apr 2024 13:25:35 +0800
Subject: [PATCH] SPI数据，隐患等级饼图信息独立出来，调整查询方式
---
src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml
index 2050f7a..3e2930e 100644
--- a/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml
@@ -112,7 +112,12 @@
<!-- List<TroubleDataRespDTO> getSPIData(SPIDataReqBO spiDataReqBO);-->
<select id="getSPIData" resultType="com.ruoyi.doublePrevention.entity.SPI.TroubleData">
SELECT
- DATE_FORMAT(register_create_time, '%Y-%m') time, sum(1) count
+ DATE_FORMAT(register_create_time, '%Y-%m') time, sum(1) count,
+ sum(case when rectify_status = '1' then 1 else 0 end) rectifyFinish,
+ sum(case when rectify_status = '0' then 1 else 0 end) rectifyNotFinish,
+ sum(case when accept_result = '1' then 1 else 0 end) accept,
+ sum(case when danger_level = '0' then 1 else 0 end) generalDanger,
+ sum(case when danger_level = '1' then 1 else 0 end) majorDanger
FROM tr_hidden_danger_check_point
WHERE register_create_time >= #{spiDataReqBO.startTime} and #{spiDataReqBO.endTime} >= register_create_time and whether_danger = 1
GROUP BY time
@@ -126,6 +131,9 @@
sum(case when trouble_type_name = 'B级隐患' then 1 else 0 end) B,
sum(case when trouble_type_name = 'C级隐患' then 1 else 0 end) C
from tr_hidden_danger_check_point
- WHERE register_create_time >= #{spiDataReqBO.startTime} and #{spiDataReqBO.endTime} >= register_create_time and whether_danger = 1
+ WHERE YEAR(register_create_time) = #{spiDataReqBO.year}
+ <if test="spiDataReqBO.month != null and spiDataReqBO.month != ''">
+ AND MONTH(register_create_time) = #{spiDataReqBO.month}
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2