巡查对象匹配检查项规则修改/ 适用类型树修改

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

@@ -305,6 +305,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 		List<EquipmentCategory> equipmentCategorys = this.iEquipmentCategoryService
 				.getEquipmentCategoryListNotFacilities(Integer.valueOf(equipmentCategoryLeftTypeCode));
 		List<EquipmentCategory> list = new ArrayList<>();
+		List<EquipmentCategory> result = new ArrayList<>();
 		Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
 		equipmentCategorys.forEach(action -> {
 			if (action.getParentId() == null) {
@@ -322,7 +323,15 @@ public class EquipmentCategoryController extends AbstractBaseController {
 			}
 		});
 		getChildren(list, tmpMap);
-		return list;
+		EquipmentCategory equipmentCategory = new EquipmentCategory();
+		equipmentCategory.setChildren(list);
+		equipmentCategory.setCode("-1");
+		equipmentCategory.setName("消防设备");
+		equipmentCategory.setId(0L);
+		equipmentCategory.setHasLowerClassification(true);
+
+		result.add(equipmentCategory);
+		return result;
 	}
 
 	/**
@@ -337,6 +346,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 		List<EquipmentCategory> equipmentCategorys = this.iEquipmentCategoryService
 				.getEquipmentCategoryListByFacilities(Integer.valueOf(equipmentCategoryLeftTypeCode));
 		List<EquipmentCategory> list = new ArrayList<>();
+		List<EquipmentCategory> result = new ArrayList<>();
 		Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
 		equipmentCategorys.forEach(action -> {
 			if (action.getName().equals("消防设施") ||action.getName().equals("消防系统")) {
@@ -354,7 +364,17 @@ public class EquipmentCategoryController extends AbstractBaseController {
 			}
 		});
 		getChildren(list, tmpMap);
-		return list;
+
+		EquipmentCategory equipmentCategory = new EquipmentCategory();
+		equipmentCategory.setChildren(list);
+		equipmentCategory.setCode("-1");
+		equipmentCategory.setName("消防设施");
+		equipmentCategory.setId(0L);
+		equipmentCategory.setHasLowerClassification(true);
+
+		result.add(equipmentCategory);
+		return result;
+
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -362,7 +362,8 @@ public class InputItemController extends AbstractBaseController {
 		ReginParams reginParams = getSelectedOrgInfo();
 		String orgCode = getOrgCode(reginParams);
 		String companyBizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
-		List<PointInputItemVo> list = inputItemService.queryCustomInputItemNew(params.get("itemType").toString(),params.get("nameOrItemNo").toString(),orgCode,companyBizOrgCode);
+
+		List<PointInputItemVo> list = inputItemService.queryCustomInputItemNew(params,orgCode,companyBizOrgCode);
 		return CommonResponseUtil.success(list);
 	}
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/InputItemServiceImpl.java

@@ -234,10 +234,8 @@ public class InputItemServiceImpl implements IInputItemService {
 	}
 
 	@Override
-	public List<PointInputItemVo> queryCustomInputItemNew(String itemType, String nameOrItemNo, String orgCode,String companyBizOrgCode) {
-		HashMap<String,Object> param = new HashMap<>();
-		param.put("itemType",itemType);
-		param.put("nameOrItemNo",nameOrItemNo);
+	public List<PointInputItemVo> queryCustomInputItemNew(HashMap<String,Object> param, String orgCode,String companyBizOrgCode) {
+
 		param.put("orgCode",orgCode);
 		param.put("bizOrgCode",companyBizOrgCode);
 		List<PointInputItemVo> content = inputItemMapper.queryCustomInputItem(param);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IInputItemService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
+import java.util.HashMap;
 import java.util.List;
 
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
@@ -129,5 +130,5 @@ public interface IInputItemService {
 
 	List<PointInputItemVo>  queryCustomInputItem (String itemType, String nameOrItemNo, String orgCode);
 
-	List<PointInputItemVo>  queryCustomInputItemNew (String itemType, String nameOrItemNo, String orgCode,String companyBizOrgCode);
+	List<PointInputItemVo>  queryCustomInputItemNew (HashMap<String,Object> param, String orgCode, String companyBizOrgCode);
 }

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

@@ -321,7 +321,7 @@
         FROM wl_equipment_category ec
                  left join wl_industry i on ec.industry_code = i.code
         WHERE
-            ec.code NOT LIKE CONCAT ('930','%') and ec.code NOT LIKE CONCAT ('92','%')
+            ec.code NOT LIKE CONCAT ('930','%') and ec.code NOT LIKE CONCAT ('92','%') and ec.industry_code = '2'
     </select>
 
     <select id="getEquipmentCategoryListByFacilities" resultMap="Category">

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -150,16 +150,16 @@
 				and (name like concat("%", #{nameOrItemNo}, "%") or item_no like concat("%", #{nameOrItemNo}, "%"))
 			</if>
 			<if test="equipmentType!=null and equipmentType !=''">
-				and  equipment_type = #{equipmentType}
+				and  equipment_type = #{equipmentType} or equipment_type = '-1'
 			</if>
 			<if test="keyPartsType!=null and keyPartsType !=''">
-			and  key_parts_type = #{keyPartsType}
+			and  key_parts_type is not null
 			</if>
 			<if test="facilitiesType!=null and facilitiesType !=''">
-			and  facilities_type = #{facilitiesType}
+			and  facilities_type = #{facilitiesType} or  facilities_type = '-1'
 			</if>
 			<if test="customType!=null and customType !=''">
-			and  custom_type = #{customType}
+			and  custom_type is not null
 			</if>
 			<if test="bizOrgCode!=null and bizOrgCode !=''">
 			and  biz_org_code LIKE CONCAT (#{bizOrgCode},'%')