From c30de75894c259ee6bc6b60b21c8e40a5eea222e Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 13 六月 2024 15:40:29 +0800
Subject: [PATCH] 临时提交
---
src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml
index 4a93fb7..54716db 100644
--- a/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml
@@ -119,7 +119,7 @@
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
+ WHERE whether_danger =1 and examine_status =1 and register_create_time >= #{spiDataReqBO.startTime} and #{spiDataReqBO.endTime} >= register_create_time and whether_danger = 1
GROUP BY time
ORDER BY time ASC
</select>
@@ -129,8 +129,13 @@
select
sum(case when trouble_type_name = 'A级隐患' then 1 else 0 end) A,
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
+ sum(case when trouble_type_name = 'C级隐患' then 1 else 0 end) C,
+ sum(case when rectify_status = '1' then 1 else 0 end) rectifyFinish,
+ sum(case when rectify_status = '0' then 1 else 0 end) rectifyNotFinish
from tr_hidden_danger_check_point
- WHERE register_create_time >= #{spiDataReqBO.startTime} and #{spiDataReqBO.endTime} >= register_create_time and whether_danger = 1
+ WHERE whether_danger =1 and examine_status =1 and 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