提交消防装备帅选条件-----所在位置

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/EquipTypeAmountPageDTO.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity.dto;
 
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.publics.BaseDTO;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -45,4 +46,7 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
 
     @ApiModelProperty(value = "行业编码")
     private String industryCode;
+    
+    @ApiModelProperty(value = "所在位置名称")
+    private String warehouseStructureName;
 }

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

@@ -552,6 +552,7 @@
     </select>
     <select id="getColaCategoryAmountList" resultMap="CategoryAmountList">
         <if test="equipTypeAmountPage.type == 'equipment' or codeHead==null or codeHead=='' or codeHead==' '">
+             select * from (
             SELECT
             wles.id,
             wles.qr_code,
@@ -630,12 +631,16 @@
             <if test="equipTypeAmountPage.iotCode!=null and equipTypeAmountPage.iotCode!=''">
                 AND wles.iot_code LIKE CONCAT('%',#{equipTypeAmountPage.iotCode},'%')
             </if>
+               )s1 
+              <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
+                 where  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
+            </if>
         </if>
         <if test="(codeHead==null or codeHead=='' or codeHead==' ') and equipTypeAmountPage.status == null and equipTypeAmountPage.warehouseStructureId==null and equipTypeAmountPage.systemId==null">
             union all
         </if>
         <if test="(equipTypeAmountPage.type == 'car' or codeHead==null or codeHead=='' or codeHead==' ') and equipTypeAmountPage.status == null and equipTypeAmountPage.warehouseStructureId==null and equipTypeAmountPage.systemId==null">
-            SELECT
+             select * from (  SELECT
             wlc.id,
             wlc.qr_code,
             CONCAT('03#',wlc.qr_code) fullqrCode,
@@ -694,6 +699,10 @@
             <if test="equipTypeAmountPage.iotCode!=null and equipTypeAmountPage.iotCode!=''">
                 AND wlc.iot_code LIKE CONCAT('%',#{equipTypeAmountPage.iotCode},'%')
             </if>
+              )s2 
+              <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
+                 where  s2.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
+            </if>
         </if>
         order by createDate DESC
     </select>