检查项匹配规则变动 向上查询 包括父级节点

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/InputItemMapper.java

@@ -24,6 +24,12 @@ public interface InputItemMapper extends BaseMapper {
 
     public List<InputItemVo> getInputItemInfoNew(InputItemPageParam param);
 
+    Map<String,String> getEquipParentCode(String code);
+
+    Map<String,String> getEquipParent(String parentId);
+
+
+
     /**
      * 新接口
      * */

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

@@ -238,8 +238,31 @@ public class InputItemServiceImpl implements IInputItemService {
 
 		param.put("orgCode",orgCode);
 		param.put("bizOrgCode",companyBizOrgCode);
+		List<String> list =	new ArrayList<>();
+		if(param.containsKey("equipmentType")){
+			list = getEquipParent(param.get("equipmentType").toString(),list);
+			list .add("-1");
+			param.put("equipmentType",list);
+		}
+		List<String> list1 =	new ArrayList<>();
+		if(param.containsKey("facilitiesType")){
+			list1 = getEquipParent(param.get("facilitiesType").toString(),list1);
+			list1 .add("-1");
+			param.put("facilitiesType",list1);
+		}
 		List<PointInputItemVo> content = inputItemMapper.queryCustomInputItem(param);
 		return content;
 	}
 
+	public List<String> getEquipParent(String code,List<String> objects){
+		Map<String, String> equipmentType = inputItemMapper.getEquipParentCode(code);
+		if (!equipmentType.containsKey("parent_id") ){
+			objects.add(code);
+			return objects;
+		}
+		objects.add(code);
+		Map<String, String> parent = inputItemMapper.getEquipParent(equipmentType.get("parent_id"));
+	return 	getEquipParent(parent.get("code"),objects);
+	}
+
 }