增加帅选条件

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

@@ -54,4 +54,7 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
     private String bizOrgName;
     @ApiModelProperty(value = "单位部门org")
     private String bizOrgCode;
+
+    @ApiModelProperty(value = "队伍id")
+    private String teamId;
 }

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

@@ -599,7 +599,7 @@
             wles.biz_org_code as bizOrgCode,
             wles.biz_org_name as bizOrgName
             FROM
-            (select id,qr_code,code ,iot_code ,biz_org_code ,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
+            (select id,qr_code,code ,iot_code ,biz_org_code ,team_id,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
             LEFT JOIN (select id,amount,status,equipment_specific_id,warehouse_structure_id from wl_stock_detail ) wlsd on wlsd.equipment_specific_id = wles.id
             LEFT JOIN wl_warehouse_structure wlws on wlsd.warehouse_structure_id = wlws.id
             LEFT JOIN (select id,standard ,name ,area ,code, equipment_id ,manufacturer_id,is_import from wl_equipment_detail) wled on wles.equipment_detail_id = wled.id
@@ -614,6 +614,10 @@
             <if test="equipTypeAmountPage.industryCode!=null">
                 and wec.industry_code = #{equipTypeAmountPage.industryCode}
             </if>
+
+            <if test="equipTypeAmountPage.teamId!=null">
+                and wles.team_id = #{equipTypeAmountPage.teamId}
+            </if>
             <if test="equipTypeAmountPage.systemId!=null">
                 and wles.system_id = #{equipTypeAmountPage.systemId}
             </if>
@@ -1705,6 +1709,9 @@ FROM
         <if test="equipTypeAmountPage.industryCode!=null">
             and wec.industry_code = #{equipTypeAmountPage.industryCode}
         </if>
+        <if test="equipTypeAmountPage.teamId!=null">
+            and wlc.team_id = #{equipTypeAmountPage.teamId}
+        </if>
         <if test="equipTypeAmountPage.equipmentName!=null and equipTypeAmountPage.equipmentName!=''">
             And wlc.`NAME` LIKE CONCAT('%',#{equipTypeAmountPage.equipmentName},'%')
         </if>
@@ -1770,7 +1777,7 @@ FROM
             wles.biz_org_code as bizOrgCode,
             wles.biz_org_name as bizOrgName
             FROM
-            (select id,qr_code,code ,iot_code ,biz_org_code ,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
+            (select id,qr_code,code ,iot_code ,biz_org_code,team_id ,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
             LEFT JOIN (select id,amount,status,equipment_specific_id,warehouse_structure_id from wl_stock_detail ) wlsd on wlsd.equipment_specific_id = wles.id
             LEFT JOIN wl_warehouse_structure wlws on wlsd.warehouse_structure_id = wlws.id
             LEFT JOIN (select id,standard ,name ,area ,code, equipment_id ,manufacturer_id,is_import from wl_equipment_detail) wled on wles.equipment_detail_id = wled.id
@@ -1785,6 +1792,9 @@ FROM
             <if test="equipTypeAmountPage.industryCode!=null">
                 and wec.industry_code = #{equipTypeAmountPage.industryCode}
             </if>
+            <if test="equipTypeAmountPage.teamId!=null">
+                and wles.team_id = #{equipTypeAmountPage.teamId}
+            </if>
             <if test="equipTypeAmountPage.systemId!=null">
                 and wles.system_id = #{equipTypeAmountPage.systemId}
             </if>