消防物资查询增加逻辑删除条件

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -177,6 +177,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
                 Wrappers.<WlSpareEquipment>lambdaQuery()
                         .select(WlSpareEquipment::getStockNum)
                         .likeRight(WlSpareEquipment::getEquipCategoryCode, "420104")
+                        .eq(WlSpareEquipment::getIsDelete, false)
         );
         for (WlSpareEquipment equipment : wlSpareEquipments) {
             BigDecimal stockNum = BigDecimal.valueOf(equipment.getStockNum()).setScale(2, RoundingMode.HALF_UP);

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -214,7 +214,7 @@
         SELECT
             (
                 (SELECT COUNT(1) FROM wl_equipment_specific wel WHERE wel.equipment_code LIKE CONCAT('3104', '%') AND wel.single = 1) +
-                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3104', '%')) +
+                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3104', '%') AND wse.is_delete = false) +
                 (
                     SELECT ROUND(IFNULL(SUM(wsd.amount), 0), 2) FROM wl_stock_detail wsd WHERE wsd.equipment_specific_id IN (
                         SELECT id FROM wl_equipment_specific t WHERE t.equipment_code LIKE CONCAT('3104', '%') AND t.single = 0
@@ -223,7 +223,7 @@
             ) AS fireExtinguisher,
             (
                 (SELECT COUNT(1) FROM wl_equipment_specific wel WHERE wel.equipment_code LIKE CONCAT('3105', '%') AND wel.single = 1) +
-                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3105', '%')) +
+                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3105', '%') AND wse.is_delete = false) +
                 (
                     SELECT ROUND(IFNULL(SUM(wsd.amount), 0), 2) FROM wl_stock_detail wsd WHERE wsd.equipment_specific_id IN (
                         SELECT id FROM wl_equipment_specific t WHERE t.equipment_code LIKE CONCAT('3105', '%') AND t.single = 0
@@ -232,7 +232,7 @@
             ) AS fireHydrant,
             (
                 (SELECT COUNT(1) FROM wl_equipment_specific wel WHERE wel.equipment_code LIKE CONCAT('3910', '%') AND wel.single = 1) +
-                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3910', '%')) +
+                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3910', '%') AND wse.is_delete = false) +
                 (
                     SELECT ROUND(IFNULL(SUM(wsd.amount), 0), 2) FROM wl_stock_detail wsd WHERE wsd.equipment_specific_id IN (
                         SELECT id FROM wl_equipment_specific t WHERE t.equipment_code LIKE CONCAT('3910', '%') AND t.single = 0
@@ -241,7 +241,7 @@
             ) AS fireShovel,
             (
                 (SELECT COUNT(1) FROM wl_equipment_specific wel WHERE wel.equipment_code LIKE CONCAT('3904', '%') AND wel.single = 1) +
-                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3904', '%')) +
+                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3904', '%') AND wse.is_delete = false) +
                 (
                     SELECT ROUND(IFNULL(SUM(wsd.amount), 0), 2) FROM wl_stock_detail wsd WHERE wsd.equipment_specific_id IN (
                         SELECT id FROM wl_equipment_specific t WHERE t.equipment_code LIKE CONCAT('3904', '%') AND t.single = 0
@@ -250,7 +250,7 @@
             ) AS fireAxe,
             (
                 (SELECT COUNT(1) FROM wl_equipment_specific wel WHERE wel.equipment_code LIKE CONCAT('3911', '%') AND wel.single = 1) +
-                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3911', '%')) +
+                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('3911', '%') AND wse.is_delete = false) +
                 (
                     SELECT ROUND(IFNULL(SUM(wsd.amount), 0), 2) FROM wl_stock_detail wsd WHERE wsd.equipment_specific_id IN (
                         SELECT id FROM wl_equipment_specific t WHERE t.equipment_code LIKE CONCAT('3911', '%') AND t.single = 0
@@ -259,7 +259,7 @@
             ) AS fireBucket,
             (
                 (SELECT COUNT(1) FROM wl_equipment_specific wel WHERE wel.equipment_code LIKE CONCAT('1106', '%') AND wel.single = 1) +
-                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('1106', '%')) +
+                (SELECT ROUND(IFNULL(SUM(wse.stock_num), 0), 2) FROM wl_spare_equipment wse WHERE wse.equip_category_code LIKE CONCAT('1106', '%') AND wse.is_delete = false) +
                 (
                     SELECT ROUND(IFNULL(SUM(wsd.amount), 0), 2) FROM wl_stock_detail wsd WHERE wsd.equipment_specific_id IN (
                         SELECT id FROM wl_equipment_specific t WHERE t.equipment_code LIKE CONCAT('1106', '%') AND t.single = 0