From 48916121661ecac6836f528b2ff00042914b13ec Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 25 四月 2024 10:41:19 +0800
Subject: [PATCH] 保留备注字段(不使用),调整错误返回信息

---
 src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/doublePrevention/TrHiddenDangerCheckPointMapper.xml
index 2050f7a..4a93fb7 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

--
Gitblit v1.9.2