代码合并

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

@@ -3475,4 +3475,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return 	baseMapper.selectList(wrapper);
 	}
 
+	public List<OrgUsr> getDetByCompanyId(String companyId){
+		QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>();
+		wrapper.eq("is_delete",false);
+		wrapper.eq("parent_id",companyId);
+		wrapper.eq("biz_org_type","DEPARTMENT");
+		return 	baseMapper.selectList(wrapper);
+	}
+
 }
\ No newline at end of file

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

@@ -74,6 +74,9 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     @Autowired
     EquipFeignClient equipFeignClient;
 
+    @Value("classpath:/json/equipmentWaterCode.json")
+    private org.springframework.core.io.Resource equipmentWaterCode;
+
     /**
      * 分页查询
      */
@@ -527,4 +530,27 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         }
         return list;
     }
+
+    public List<Map<String, Object>> getWaterResourceInfoList(String bizOrgCode) {
+        String json = null;
+        try {
+            json = IOUtils.toString(equipmentWaterCode.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        List<Map> mapList = JSONObject.parseArray(json, Map.class);
+        Map<String, Object> map = new HashMap<>();
+        mapList.forEach(x -> map.put(String.valueOf(x.get("nameKey")), x.get("type")));
+        map.put("bizOrgCode", bizOrgCode);
+        Map<String, Object> result = waterResourceMapper.getWaterResourceInfoList(map);
+        List<Map<String, Object>> list = new ArrayList<>();
+        mapList.forEach(y -> {
+            Map<String, Object> tempMap = new HashMap<>();
+            tempMap.put("name", y.get("name"));
+            tempMap.put("code", y.get("nameKey"));
+            tempMap.put("total", result.get(y.get("nameKey")));
+            list.add(tempMap);
+        });
+        return  list;
+    }
 }