From 147466c117b56fad2626217bb259133d8d284360 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Fri, 20 Mar 2026 10:23:44 +0800
Subject: [PATCH] 修改仓库库存显示

---
 hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml |   99 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
index 784fde8..03ddf27 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
@@ -77,8 +77,8 @@
 
     <select id="selectHazmatGroupWareHouse" resultType="com.gkhy.hazmat.system.domain.vo.HzHazmatWarehouseVO">
         select a.basic_id,a.warehouse_id,a.cupboard_id,
-        (select count(1) from hz_hazmat where state=0 and basic_id=a.basic_id and warehouse_id=a.warehouse_id) as stock,
-        (select count(1) from hz_hazmat where state=1 and basic_id=a.basic_id and warehouse_id=a.warehouse_id) as miss_stock
+        SUM(CASE WHEN a.state = 0 THEN 1 ELSE 0 END) AS stock,
+        SUM(CASE WHEN a.state = 1 THEN 1 ELSE 0 END) AS miss_stock
         from hz_hazmat a
         left join hz_hazmat_basic b on b.id=a.basic_id
         <where>
@@ -103,6 +103,7 @@
             and a.del_flag=0 and b.del_flag = 0
         </where>
         group by a.basic_id,a.warehouse_id, a.cupboard_id
+        HAVING stock > 0 OR miss_stock > 0
     </select>
 
 
@@ -149,13 +150,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 hhf2.create_time &gt;= #{startTime} and hhf2.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 +185,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