From 72fc14d9b157897f2581137d7d463eb72da8f135 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 29 七月 2025 15:28:11 +0800
Subject: [PATCH] 修改

---
 hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml |   96 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
index 34dfdd3..893e884 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
@@ -100,7 +100,7 @@
             <if test="params.productSn != null and params.productSn != ''">
                 AND b.product_sn =#{params.productSn}
             </if>
-            and a.del_flag=0
+            and a.del_flag=0 and b.del_flag = 0
         </where>
         group by a.basic_id,a.warehouse_id, a.cupboard_id
     </select>
@@ -149,13 +149,28 @@
     </select>
 
     <select id="useCountStatic" resultType="com.gkhy.hazmat.system.domain.vo.HzHazmatUseVO">
-        select count(*) as count,basic_id from hz_hazmat
-        where create_time &gt;= #{startTime} and create_time &lt;= #{endTime} and state =3
+        SELECT
+        count(*) AS count,
+        hh2.basic_id
+        FROM
+        hz_hazmat hh2
+        LEFT JOIN hz_hazmat_flow hhf2 on hh2.id = hhf2.hazmat_id
+        LEFT JOIN sys_user sy on hhf2.create_id =  sy.id
+        LEFT JOIN sys_dept sd on sy.depart_id = sd.id
+        where hh2.create_time &gt;= #{startTime} and hh2.create_time &lt;= #{endTime} and hh2.state =3 and hhf2.state = 4
         <if test="companyId!=null">
-            and company_id=#{companyId}
+            and hh2.company_id=#{companyId}
         </if>
-        group by basic_id
-        order by count desc
+        <if test="userId!=null">
+            and hhf2.create_id = #{userId}
+        </if>
+        <if test="departId!=null">
+            and sd.id = #{departId}
+        </if>
+        GROUP BY
+        hh2.basic_id
+        ORDER BY
+        count DESC
     </select>
 
 
@@ -169,4 +184,73 @@
         order by a.id
         limit #{startIndex},#{pageSize}
     </select>
+    <select id="useCountHourlyStatic" resultType="com.gkhy.hazmat.system.domain.vo.HzEntryRecordVO">
+        SELECT
+        DATE_FORMAT(create_time, '%H') AS hour,
+        COUNT(*) AS count
+        FROM hz_hazmat
+        WHERE create_time &gt;= #{startDate}
+        AND create_time &lt; #{endDate}
+        AND state IN (2, 3)
+        <if test="companyId != null">
+            AND company_id = #{companyId}
+        </if>
+        GROUP BY hour
+        ORDER BY hour ASC
+    </select>
+
+
+
+    <select id="companyMessage" resultType="com.gkhy.hazmat.system.domain.vo.HzCompanyMessage">
+        SELECT
+            sc.id,
+            sc.name as company_name,
+            scf.longitude,
+            scf.latitude,
+            COALESCE(hw.warehouse_count, 0) AS warehouse_count,
+            COALESCE(htw.warning_count, 0) AS warning_count,
+            htw.latest_warning_time
+        FROM sys_company sc
+                 LEFT JOIN (
+            SELECT company_id, COUNT(*) AS warehouse_count
+            FROM hz_warehouse
+            WHERE del_flag = 0
+            GROUP BY company_id
+        ) hw ON sc.id = hw.company_id
+                 LEFT JOIN (
+            SELECT
+                company_id,
+                COUNT(*) AS warning_count,
+                MAX(create_time) AS latest_warning_time
+            FROM hz_taboo_warning
+            WHERE del_flag = 0
+            GROUP BY company_id
+        ) htw ON sc.id = htw.company_id
+        LEFT JOIN sys_config scf on sc.id = scf.company_id
+        <where>
+            sc.del_flag = 0
+            <if test="type!=null">
+                and sc.type = #{type}
+            </if>
+        </where>
+        ORDER BY htw.latest_warning_time DESC;
+    </select>
+    <select id="countTotal" resultType="java.lang.Integer">
+        SELECT
+        COUNT(*) AS total_count
+        FROM hz_hazmat
+        WHERE state IN (2, 3)
+        <if test="companyId != null">
+            AND company_id = #{companyId}
+        </if>
+    </select>
+    <!--    SELECT COUNT(*) AS count, DATE_FORMAT(create_time, '%H') AS hour-->
+<!--    FROM hz_hazmat-->
+<!--    WHERE create_time &gt;= #{startDate} AND create_time &lt;  #{endDate}-->
+<!--    AND state IN (2, 3)-->
+<!--    <if test="companyId != null">-->
+<!--        AND company_id = #{companyId}-->
+<!--    </if>-->
+<!--    GROUP BY hour-->
+<!--    ORDER BY hour ASC-->
 </mapper>

--
Gitblit v1.9.2