提交消防水源改造和excle导入变动

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -558,4 +558,11 @@ public class WaterResourceController extends BaseController {
     	JSONObject list  = waterResourceServiceImpl.getwaterResourceTypeTree(bizOrgCode);
 		return ResponseHelper.buildResponse(list);
     }
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/type/XFSYLX", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "点击添加按钮显示的页签数据", notes = "点击添加按钮显示的页签数据")
+    public ResponseModel<Object> getwaterResourceType() throws Exception {
+    		Object list  = waterResourceServiceImpl.getwaterResourceType();
+		return ResponseHelper.buildResponse(list);
+    }
 }

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -367,16 +370,77 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
 			Map<String, Object>  map=	waterResourceMapper.getWaterTypeByBizOrgCode(bizOrgCode);
 			int num=0;
 			JSONArray waterTypeDetailChildrenArray = waterTypeDetailJson.getJSONArray("children");
+			JSONArray array = new JSONArray();
 			for (Object childObject : waterTypeDetailChildrenArray) {
 				JSONObject detail=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
 				String codeStr =	detail.getString("code");
-				if(map.containsKey(codeStr)) {
+				if(map!=null && map.containsKey(codeStr)) {
 					num=num+Integer.parseInt( map.get("codeStr").toString());
-					detail.put("num", map.get("codeStr"));
+					detail.put("num", Integer.parseInt( map.get("codeStr").toString()));
+				}else {
+					detail.put("num", 0);
 				}
+				array.add(detail);
 			}
+			waterTypeDetailJson.remove("children");
+			waterTypeDetailJson.put("children", array);
 			waterTypeDetailJson.put("num", num);
 		}
 		return	waterTypeDetailJson;
 	}
+	public Object getwaterResourceType() throws Exception {
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		ResponseModel <Object>  response= 	equipFeignClient.list();
+		if(response.getStatus() != 200) {
+			return null;
+		}
+		Object resultObject =	response.getResult();
+		JSONArray childrenArray = null;
+		JSONArray waterTypeDetailArray = null;
+		JSONObject waterTypeDetailJson=null;
+		JSONArray resultArray =	JSONArray.parseArray(JSONArray.toJSONString(resultObject));
+		for (Object obj : resultArray) {
+			JSONObject detailJsonObject=	JSONObject.parseObject(JSONObject.toJSONString(obj));
+			String codeString =	detailJsonObject.getString("code");
+			if(codeString.equals("90000000")) {
+				childrenArray = detailJsonObject.getJSONArray("children");
+				break;
+			}
+		}
+		if(childrenArray!=null && childrenArray.size()>0) {
+			for (Object childObject : childrenArray) {
+				JSONObject detailChildJsonObject=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
+				String codeStr =	detailChildJsonObject.getString("code");
+				if(codeStr.equals("93000000")) {
+					waterTypeDetailArray=detailChildJsonObject.getJSONArray("children");
+					break;
+				}
+			}
+			
+		}
+		if(waterTypeDetailArray!=null && waterTypeDetailArray.size()>0) {
+			for (Object childObject : waterTypeDetailArray) {
+				JSONObject waterTypeDetail=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
+				String codeStr =	waterTypeDetail.getString("code");
+				if(codeStr.equals("93060000")) {
+					waterTypeDetailJson =	waterTypeDetail;
+					break;
+				}
+			}
+		}
+		if(waterTypeDetailJson!=null) {
+			JSONArray waterTypeDetailChildrenArray = waterTypeDetailJson.getJSONArray("children");
+			
+			for (Object childObject : waterTypeDetailChildrenArray) {
+				Map<String, Object> map = new LinkedHashMap<>();
+				JSONObject detail=	JSONObject.parseObject(JSONObject.toJSONString(childObject));
+				String codeStr =	detail.getString("code");
+				String name =	detail.getString("name");
+				map.put("code", codeStr);
+				map.put("name", name);
+				list.add(map);
+			}
+		}
+		return	list;
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -84,6 +84,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersWorkexperience;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.entity.RescueEquipment;
 import com.yeejoin.amos.boot.module.common.api.entity.SpecialPositionStaff;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
@@ -821,6 +822,8 @@ public class ExcelServiceImpl {
 				try {
 					OrgUsrFormDto companyDto = orgUsrServer.selectCompanyById(Long.parseLong(companyArray[1]));
 					fireTeam.setCompanyCode(companyDto.getBizOrgCode());
+					fireTeam.setBizOrgCode(companyDto.getBizOrgCode());
+					fireTeam.setBizOrgName(companyDto.getBizOrgName());
 					} catch (Exception e) {
 
 				}
@@ -924,6 +927,11 @@ public class ExcelServiceImpl {
 				String[] managementUnit = item.getManagementUnit().split("@");
 				item.setManagementUnit(managementUnit[0]);
 				item.setManagementUnitId(Long.valueOf(managementUnit[1]));
+				OrgUsr org = orgUsrService.getById(Long.valueOf(managementUnit[1]));
+				if(org!=null) {
+					item.setBizOrgCode(org.getBizOrgCode());
+					item.setBizOrgName(org.getBizOrgName());
+				}
 			}
 			if (item.getMaintenanceUnit() != null) {
 				String[] maintenanceUnit = item.getMaintenanceUnit().split("@");