优化微型消防站绑定装备规则

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -38,6 +38,10 @@ public interface EquipFeignClient {
     @RequestMapping(value = "/equipSpecific/getAirEquipSpecificPage", method = RequestMethod.POST)
     ResponseModel<Page<Object>> getAirEquipSpecificPage(@RequestBody Object var1) throws InnerInvokException;
 
+
+    @RequestMapping(value = "/equipSpecific/getequipmentIPage", method = RequestMethod.POST)
+    ResponseModel<Page<Object>> equipmentIPage(@RequestBody Object var1) throws InnerInvokException;
+
     /**
      * 人员装备列装
      *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirestationJacketService.java

@@ -24,4 +24,6 @@ public interface IFirestationJacketService {
     boolean update(String type, FirestationJacket firestationJacket);
 
     ResponseModel<Object> getEquipByStockDetailId(Long stockDetailId);
+
+    ResponseModel<Page<Object>> equipmentIPage(EquipSpecificDto equipSpecificDto, int current, int size);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -271,6 +271,13 @@ public class EquipmentSpecificController extends AbstractBaseController {
         return equipmentSpecificSerivce.onCarVoIPage(equipmentSpecificDto);
     }
 
+    @RequestMapping(value = "/getequipmentIPage", method = RequestMethod.POST)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<EquipmentOnCarVo> getequipmentIPage(@RequestBody EquipmentSpecificDto equipmentSpecificDto) {
+        return equipmentSpecificSerivce.equipmentIPage(equipmentSpecificDto);
+    }
+
     @RequestMapping(value = "/getAirEquipSpecificDetail", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取设备详情", notes = "获取特定条件设备集合")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -157,6 +157,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     List<EquipmentOnCarVo> getAirEquipSpecificList(@Param("like") String like, @Param("arr") String[] split, @Param("status") Integer status);
 
     IPage<EquipmentOnCarVo> onCarVoIPage(Page<EquipmentSpecificDto> page, @Param("vo") EquipmentSpecificDto equipmentSpecificDto);
+    IPage<EquipmentOnCarVo> equipmentIPage(Page<EquipmentSpecificDto> page, @Param("vo") EquipmentSpecificDto equipmentSpecificDto);
+
 
     EquipmentDetailVo getAirEquipSpecificDetail(Long stockDetailId);
 

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

@@ -168,6 +168,8 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     List<EquipmentOnCarVo> getAirEquipSpecificList(String like, String notLike, Integer status);
 
     IPage<EquipmentOnCarVo> onCarVoIPage(EquipmentSpecificDto equipmentSpecificDto);
+    IPage<EquipmentOnCarVo> equipmentIPage(EquipmentSpecificDto equipmentSpecificDto);
+
 
     EquipmentDetailVo getAirEquipSpecificDetail(Long stockDetailId);
 

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

@@ -1160,6 +1160,14 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         return this.baseMapper.onCarVoIPage(equipmentSpecificDto.getPage(), equipmentSpecificDto);
     }
 
+
+    @Override
+    public IPage<EquipmentOnCarVo> equipmentIPage(EquipmentSpecificDto equipmentSpecificDto) {
+        String categoryCode = equipmentSpecificDto.getCategoryCode();
+       equipmentSpecificDto.setCategories(categoryCode);
+        return this.baseMapper.equipmentIPage(equipmentSpecificDto.getPage(), equipmentSpecificDto);
+    }
+
     @Override
     public EquipmentDetailVo getAirEquipSpecificDetail(Long stockDetailId) {
         return equipmentSpecificMapper.getAirEquipSpecificDetail(stockDetailId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirestationJacketController.java

@@ -202,6 +202,15 @@ public class FirestationJacketController extends BaseController {
         return iFirestationJacketService.getAirEquipSpecificPage(equipSpecificDto, current, size);
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "消防站装备列表")
+    @RequestMapping(value = "/equipmentIPage", method = RequestMethod.GET)
+    public ResponseModel<Page<Object>> equipmentIPage(int current, int size,
+                                                      EquipSpecificDto equipSpecificDto) throws Exception {
+        return iFirestationJacketService.equipmentIPage(equipSpecificDto, current, size);
+    }
+
     /**
      * 查询设备详情（调用装备接口）
      */

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirestationJacketServiceImpl.java

@@ -49,6 +49,17 @@ public class FirestationJacketServiceImpl extends BaseService<FirestationJacketD
     }
 
     @Override
+    public ResponseModel<Page<Object>> equipmentIPage(EquipSpecificDto equipSpecificDto, int current, int size) {
+        Page page = new Page(current, size);
+        equipSpecificDto.setPage(page);
+        ResponseModel<Page<Object>> airEquipSpecificPage = equipFeignClient.equipmentIPage(equipSpecificDto);
+        return airEquipSpecificPage;
+    }
+
+
+
+
+    @Override
     public boolean saveOrUpdateBatch(Long firefightersId, List<EquipmentOnCarDto> equipmentOnCarDtos) {
         List<Long> ids = equipmentOnCarDtos.stream().map(EquipmentOnCarDto::getStockDetailId).collect(Collectors.toList());
         List<Object> result = equipFeignClient.stockBindEquip(ids).getResult();

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

@@ -1177,6 +1177,59 @@
         GROUP BY
         ed.id
     </select>
+
+
+    <select id="equipmentIPage" resultType="com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo">
+        SELECT
+        ed.`name` AS equipmentSpecificName,
+        e.name AS equipDefinitionName,
+        es.`code` AS equipmentSpecificCode,
+        es.id AS equipmentSpecificId,
+        sd.id AS stockDetailId,
+        ed.id AS equipmentDetailId,
+        SUM( sd.amount ) AS amount,
+        sd.status as status
+        FROM
+        wl_equipment_specific es
+        LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
+        LEFT JOIN wl_equipment e ON e.id = ed.equipment_id
+        LEFT JOIN wl_equipment_category ec ON ec.id = e.category_id
+        LEFT JOIN wl_stock_detail sd ON es.id = sd.equipment_specific_id
+        <where>
+            <if test="vo.like != null and vo.like !=''">
+                ed.`name` LIKE CONCAT('%', #{vo.like}, '%')
+            </if>
+            <if test="vo.team != null  and vo.carId !=null">
+                and  es.team_id = (select team_id from  wl_car where id =#{vo.carId})
+            </if>
+
+            <if test="vo.categories != null and vo.categories != ''">
+                and ec.industry_code='2'  AND  left(ec.`code`,1) in (1,3,5,6,7)
+
+            </if>
+
+            <if test="vo.status != null">
+                AND sd.`status` = #{vo.status}
+            </if>
+            <if test="vo.teamId != null and vo.teamId != ''">
+                AND es.`team_id` = #{vo.teamId}
+            </if>
+
+            <if test="vo.agencyId != null and vo.agencyId != ''">
+                AND es.`agency_id` = #{vo.agencyId}
+            </if>
+
+            <if test="vo.bizOrgCode != null and vo.bizOrgCode != ''">
+                AND es.`biz_org_code` LIKE CONCAT(#{vo.bizOrgCode}, '%')
+            </if>
+            AND sd.amount > 0
+        </where>
+        GROUP BY
+        ed.id
+    </select>
+
+
+
     <select id="getAirEquipSpecificDetail" resultType="com.yeejoin.equipmanage.common.vo.EquipmentDetailVo">
         SELECT
         sd.id,