// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersExcelDto.java

@@ -50,7 +50,7 @@ public class FirefightersExcelDto extends BaseDto {
     @ApiModelProperty(value = "机构code")
     private String companyCode;
 
-
+    @ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class,method="getCompany") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
     @ExcelProperty(value = "所属部门", index = 3)
     @ApiModelProperty(value = "机构名称")
     private String companyName;
@@ -87,6 +87,7 @@ public class FirefightersExcelDto extends BaseDto {
     @ApiModelProperty(value = "籍贯/户口所在地")
     private String nativePlace;
 
+    @ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
     @ExcelProperty(value = "户籍所在地", index = 10)
     @ApiModelProperty(value = "籍贯/户口所在地的值")
     private String nativePlaceValue;
@@ -96,6 +97,7 @@ public class FirefightersExcelDto extends BaseDto {
     @ApiModelProperty(value = "政治面貌代码")
     private String politicalOutlook;
 
+    @ExplicitConstraint(indexNum = 12, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
     @ExcelProperty(value = "现居住地", index = 12)
     @ApiModelProperty(value = "现居住地")
     private String residence;

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

@@ -67,7 +67,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
         // 现居住地保存地址信息 户籍所在地信息 BUG3553 bykongfm
         FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
         firefighter.setResidence(region.getResult().getRegionName());
-        FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+        FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
         firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
         save(firefighter);
         FirefightersContacts firefightersContact = firefighters.getFirefightersContacts();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -170,7 +170,7 @@ public class FirefightersController extends BaseController {
 			Firefighters firefighter = firefighters.getFirefighters();
 			FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
 			firefighter.setResidence(region.getResult().getRegionName());
-			FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+			FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
 			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
 			iFirefightersService.updateById(firefighter);
 			ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -10,6 +11,9 @@ import javax.annotation.Resource;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -72,6 +76,10 @@ public class DataSourcesImpl implements DataSources {
 	@Autowired
 	ILinkageUnitService linkageUnitServiceImpl;
 
+
+	@Autowired
+	OrgUsrServiceImpl iOrgUsrService;
+
 	@Value("${security.systemctl.name}")
 	private String systemctl;
 
@@ -138,6 +146,12 @@ public class DataSourcesImpl implements DataSources {
 			case "getUnitTeam":
 				str =getUnitTeam();
 				break;
+			case "getCompany":
+				str =getCompany();
+				break;
+			case "getCitys":
+				str =getCitys();
+				break;
 			}
 		}
 		return str;
@@ -312,4 +326,40 @@ public class DataSourcesImpl implements DataSources {
 		String[] str = names.toArray(new String[names.size()]);
 		return str;
 	}
+
+	/**
+	 * 消防队员模板获取所属部门
+	 * @return
+	 */
+	private String[] getCompany() {
+		List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
+		List<String> names = menus.stream().map(item -> {
+			return item.getName() + "@" + item.getKey();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
+
+	/**
+	 * 消防队员模板获取地址
+	 * @return
+	 */
+	private String[] getCitys() {
+		FeignClientResult<java.util.Collection<RegionModel>> region =  Systemctl.regionClient.queryForTreeParent(null);
+		java.util.Collection<RegionModel> regions = region.getResult();// 以及地址
+		List<String> address = new ArrayList<>();
+		setAddress(address,regions);
+		String[] str = address.toArray(new String[address.size()]);
+		return str;
+	}
+
+	private void setAddress(List<String> address, Collection<RegionModel> regions) {
+		regions.stream().forEach(item -> {
+			//添加自己的
+			address.add(item.getRegionName() + "@" + item.getSequenceNbr());
+			if(item.getChildren() != null && item.getChildren().size() > 0) {
+				setAddress(address,item.getChildren());
+			}
+		});
+	}
 }

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

@@ -507,6 +507,22 @@ public class ExcelServiceImpl {
                         String relationship = firefightersContacts.getRelationship().split("@")[1];
                         firefightersContacts.setRelationship(relationship);
                     }
+                    if(firefighters.getCompanyName() != null) {
+                        String[] tempCompany = firefighters.getCompanyName().split("@");
+                        firefighters.setCompanyName(tempCompany[0]);
+                        firefighters.setCompany(tempCompany[1]);
+                    }
+                    if(firefighters.getNativePlaceValue() != null) {
+                        String[] tempCity = firefighters.getNativePlaceValue().split("@");
+                        firefighters.setNativePlaceValue(tempCity[0]);
+                        firefighters.setNativePlace(tempCity[1]);
+                    }
+                    if(firefighters.getResidence() != null) {
+                        String[] tempCity = firefighters.getResidence().split("@");
+                        firefighters.setResidence(tempCity[0]);
+                        firefighters.setResidenceDetails(tempCity[1]);
+                    }
+                    // BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
                     FirefightersInfoDto firefightersInfo = new FirefightersInfoDto(firefighters, firefightersContacts);
                     firefightersService.saveFirefighters(firefightersInfo);
                 }