消防水源消防队伍改造

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -47,7 +47,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
      */
     Page<WaterResourceDto> getWaterResourcePageByParams(Page<WaterResourceDto> page, String name, String resourceType,
                                                         ArrayList<Long> belongBuildingId, Long belongFightingSystemId,
-                                                        Long sequenceNbr, String equipId,String bizOrgCode);
-    
-    Map<String, Object> getWaterTypeByBizOrgCode(String bizOrgCode);
+                                                        Long sequenceNbr, String equipId,String bizOrgCode, String equipCateGoryCode);
+
+    List<Map<String, Object>> getWaterTypeByBizOrgCode(String bizOrgCode);
  }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -134,6 +134,7 @@
         select * from cb_water_resource where is_delete = 1
         <if test="sequenceNbr != null and sequenceNbr != ''">and sequence_nbr = #{sequenceNbr}</if>
         <if test="resourceType != null and resourceType != ''">and resource_type = #{resourceType}</if>
+        <if test="equipCateGoryCode != null and equipCateGoryCode != ''">and equip_category_code = #{equipCateGoryCode}</if>
         <if test="equipId != null and equipId != ''">and equip_id = #{equipId}</if>
         <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
         <if test="belongFightingSystemId != null">
@@ -152,15 +153,15 @@
     </select>
 	<select id="getWaterTypeByBizOrgCode" resultType="map">
      SELECT
-		equip_category_code,
+        equip_category_code type,
 		COUNT(sequence_nbr) as num
 	FROM
 		cb_water_resource
 	WHERE
-		is_delete = 0
+		is_delete = 1
 		   <if test="bizOrgCode != null and bizOrgCode != ''">AND biz_org_code like concat( #{bizOrgCode}, '%')</if>
 	GROUP BY
-	equip_category_code
+    equip_category_code
 
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -465,14 +465,15 @@ public class WaterResourceController extends BaseController {
                                                               Long belongFightingSystemId, Long sequenceNbr,
                                                               String resourceType,
                                                               String classifyId,
-                                                              String bizOrgCode) {
+                                                              String bizOrgCode,
+                                                              String equipCateGoryCode) {
         Page<WaterResourceDto> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
 
         /*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
         Page<WaterResourceDto> waterResourceDtoPage = waterResourceServiceImpl.queryForWaterResourcePage(page, name, resourceType,
-                belongBuildingId, belongFightingSystemId, sequenceNbr, classifyId,bizOrgCode);
+                belongBuildingId, belongFightingSystemId, sequenceNbr, classifyId,bizOrgCode,  equipCateGoryCode);
         List<WaterResourceDto> records = waterResourceDtoPage.getRecords();
         records.forEach(i->{
             Map<String, List<AttachmentDto>> attachments = sourceFileService.getAttachments(i.getSequenceNbr());