Merge branch 'developer' of http://e7ypyu8.nat.ipyingshe.com/moa/amos-boot-biz into developer

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

@@ -21,7 +21,7 @@ public interface KeySiteMapper extends BaseMapper<KeySite> {
  */
 
 public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
-			String useNature, String fireFacilitiesInfo, Long belongId);
+			String useNature, String fireFacilitiesInfo, Long belongId,String belongName);
 /**
  * 获取所有的重点部位数据
  * @return

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

@@ -53,6 +53,9 @@
 		<if test="belongId != null and belongId!='-1' and belongId != -1">
 			AND c.`belong_id`= #{belongId}
 		</if>
+		<if test="belongName != null and belongName !=''">
+			AND c.`belong_name` like concat('%',#{belongName},'%')
+		</if>
 		order by c.rec_date desc
 	</select>
 	

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-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java

@@ -177,12 +177,12 @@ public class KeySiteController extends BaseController {
 			@RequestParam(value = "size") int size, @RequestParam(required = false) String name,
 			@RequestParam(required = false) Long buildingId, @RequestParam(required = false) String fireEnduranceRate,
 			@RequestParam(required = false) String useNature, @RequestParam(required = false) String fireFacilitiesInfo,
-			@RequestParam(required = false) Long belongId) {
+			@RequestParam(required = false) Long belongId, @RequestParam(required = false) String belongName) {
 		Page<KeySiteDto> page = new Page<KeySiteDto>();
 		page.setCurrent(current);
 		page.setSize(size);
 		return ResponseHelper.buildResponse(keySiteServiceImpl.getPageList(page, name, buildingId, fireEnduranceRate,
-				useNature, fireFacilitiesInfo, belongId));
+				useNature, fireFacilitiesInfo, belongId,belongName));
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -61,8 +61,8 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	 * 分页查询
 	 */
 	public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
-			String useNature, String fireFacilitiesInfo, Long belongId){
-		return keySiteMapper.getPageList(page,name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId);
+			String useNature, String fireFacilitiesInfo, Long belongId, String belongName){
+		return keySiteMapper.getPageList(page,name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId,belongName);
 	}
 
 	@Override

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>