From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml b/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml
index c5687f6..8292ab2 100644
--- a/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml
+++ b/src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml
@@ -3,6 +3,7 @@
<mapper namespace="com.gk.hotwork.Mapper.InspectionHiddenDangerMapper" >
<update id="delByInspectionItemId">
update inspection_hidden_danger set valid_flag = 0 , update_time = #{inspectionHiddenDanger.updateTime},update_by = #{inspectionHiddenDanger.updateBy}
+ where self_inspection_item_id = #{inspectionHiddenDanger.selfInspectionItemId}
</update>
<update id="delByIds">
@@ -23,12 +24,12 @@
(
SELECT
t.*,
- ( CASE WHEN t.unrectifyCount = 0 THEN -1 WHEN t.unrectifyCount = t.hdTocalCount THEN 2 ELSE 1 END ) rectificationStatus
+ ( CASE WHEN t.unRectifyCount = t.hdTocalCount THEN - 1 WHEN t.rectifyCount = t.hdTocalCount THEN 2 ELSE 1 END ) rectificationStatus
FROM
(
SELECT
s.*,
- count( h.`status` = -1 OR NULL ) unRectifyCount,
+ count( h.`status` = - 1 OR NULL ) unRectifyCount,
count( h.`status` = 1 OR NULL ) rectifyCount,
count( h.`status` ) hdTocalCount,
count( h.LEVEL = 1 OR NULL ) sameAsCount,
@@ -45,7 +46,8 @@
) t
) l
LEFT JOIN company AS co ON l.checked_company_id = co.id
- where 1=1
+ WHERE
+ 1 =1
<if test="params.inspectionName != null and params.inspectionName != ''">
and l.inspection_name like concat("%",#{params.inspectionName},"%")
</if>
@@ -76,7 +78,7 @@
<if test="params.area != null and params.area != ''" >
and co.area = #{params.area}
</if>
- ORDER BY l.create_time
+ ORDER BY l.create_time desc
</select>
<select id="inspectionHdangerlist" resultType="com.gk.hotwork.Domain.InspectionHiddenDanger">
SELECT
@@ -102,5 +104,56 @@
and h.self_inspection_id = #{selfInspectionId}
</select>
+ <select id="getStatisticHiddenDanger" resultType="com.gk.hotwork.Domain.Do.CompanyInspectionCountDO">
+ select
+ l.checked_company_id as companyId,
+ count(l.id) as checkTotal,
+ sum(l.unRectifyTotal) as sUnReTotal,
+ sum(l.reTotal) as sReTotal,
+ sum(l.hdTocal) as sHdTotal,
+ sum(l.saTotal) as sSaTotal,
+ sum(l.maTotal) as sMaTotal,
+ sum(l.saReTotal) as sSaReTotal,
+ sum(l.maReTotal) as sMaReTotal
+ from (
+ SELECT
+ s.id,
+ s.checked_company_id,
+ t.*
+ FROM
+ safety_self_inspection s
+ INner JOIN company c on s.checked_company_id = c.id
+ LEFT JOIN (
+ SELECT
+ h.self_Inspection_id,
+ count( h.`status` = - 1 OR NULL ) unRectifyTotal,
+ count( h.`status` = 1 OR NULL ) reTotal,
+ count( h.`status` ) hdTocal,
+ count( h.LEVEL = 1 OR NULL ) saTotal,
+ count( h.LEVEL = 2 OR NULL ) maTotal,
+ count( h.LEVEL = 1 AND h.`status` = 1 OR NULL ) saReTotal,
+ count( h.LEVEL = 2 AND h.`status` = 1 OR NULL ) maReTotal
+ FROM
+ inspection_hidden_danger h
+ WHERE
+ h.valid_flag = 1
+ GROUP BY
+ h.self_Inspection_id
+ ) t ON t.self_Inspection_id = s.id
+ WHERE
+ s.valid_flag = 1
+ and s.flag = 2
+ <if test="query.startTime != null" >
+ and s.inspection_time <![CDATA[ >= ]]> #{query.startTime}
+ </if>
+ <if test="query.endTime != null" >
+ and s.inspection_time <![CDATA[ <= ]]> #{query.endTime}
+ </if>
+ <if test="query.area != null and query.area != ''" >
+ and c.area = #{query.area}
+ </if>
+ ) l
+ GROUP BY l.checked_company_id
+ </select>
</mapper>
--
Gitblit v1.9.2