增加 重点部位 单位筛选

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-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