修改bug

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

@@ -63,48 +63,51 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "政治面貌")
     private String politicalOutlook;
 
-    @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
-    @ExcelProperty(value = "籍贯", index = 8)
+   // @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
+    @ExcelIgnore
+ //   @ExcelProperty(value = "籍贯", index = 8)
     @ApiModelProperty(value = "籍贯")
     private String nativePlace;
 
 //    @ExplicitConstraint(indexNum = 9, sourceClass = RoleNameExplicitConstraint.class, method = "getAdministrativeDivisions") //固定下拉内容
-
-    @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 9)
+    @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
+    @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 8)
     @ApiModelProperty(value = "籍贯/户口所在地详细地址")
     private String nativePlaceVal;
 
-    @ExplicitConstraint(indexNum = 10,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+   // @ExplicitConstraint(indexNum = 10,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
     @ApiModelProperty(value = "现居住地")
-    @ExcelProperty(value = "现居住地", index = 10)
+    @ExcelIgnore
+    //@ExcelProperty(value = "现居住地", index = 10)
     private String residence;
 
 
-
-    @ExplicitConstraint(indexNum =11,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
-    @ExcelProperty(value = "现居住地", index = 11)
+  //  @ExcelIgnore
+    //@ExplicitConstraint(indexNum =11,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+    @ExcelProperty(value = "现居住地", index = 10)
     @ApiModelProperty(value = "居住地详情")
     private String residenceDetails;
 
-    @ExcelProperty(value = "现居住地详细地址", index = 12)
+    @ExplicitConstraint(indexNum =9,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+    @ExcelProperty(value = "现居住地", index = 9)
     @ApiModelProperty(value = "现居住地详细地址")
     private String residenceDetailVal;
 
-    @ExcelProperty(value = "办公电话", index = 13)
+    @ExcelProperty(value = "办公电话", index = 11)
     @ApiModelProperty(value = "办公电话")
     private String officePhone;
 
-    @ExcelProperty(value = "移动电话", index = 14)
+    @ExcelProperty(value = "移动电话", index = 12)
     @ApiModelProperty(value = "移动电话")
     private String mobilePhone;
 
-    @ExplicitConstraint(type = "XLLX", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "最高学历", index = 15)
+    @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "最高学历", index = 13)
     @ApiModelProperty(value = "最高学历")
     private String highestEducation;
 
-    @ExplicitConstraint(type = "GWMC", indexNum = 16, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "岗位名称", index = 16)
+    @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位名称", index = 14)
     @ApiModelProperty(value = "岗位名称")
     private String jobs;
 
@@ -112,8 +115,8 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "岗位名称code")
     private String jobsCode;
 
-    @ExplicitConstraint(type = "ZJLY", indexNum = 17, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防专家领域", index = 17)
+    @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防专家领域", index = 15)
     @ApiModelProperty(value = "消防专家领域")
     private String expert;
 
@@ -147,7 +150,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "消防机构name")
     private Long fireTeamName;
 
-    @ExcelProperty(value = "备注", index = 18)
+    @ExcelProperty(value = "备注", index = 16)
     @ApiModelProperty(value = "备注")
     private String note;
 

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

@@ -875,6 +875,16 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 				String[] highestEducation = fireExperts.getHighestEducation().split("@");
 				fireExperts.setHighestEducation(highestEducation[1]);  // BUG  2942 by litw 2021年9月18日 导入学历编号
 			}
+			if (fireExperts.getNativePlaceVal() != null){
+				String[] nativePlaceVal = fireExperts.getNativePlaceVal().split("@");
+				fireExperts.setNativePlace(nativePlaceVal[1]);
+				fireExperts.setNativePlaceVal(nativePlaceVal[0]);
+			}
+			if (fireExperts.getResidenceDetailVal() != null){
+				String[] residenceDetailVal = fireExperts.getResidenceDetailVal().split("@");
+				fireExperts.setResidence(residenceDetailVal[1]);
+				fireExperts.setResidenceDetailVal(residenceDetailVal[0]);
+			}
 			excelEntityList.add(fireExperts);
 		});
 		fireExpertsServiceImpl.saveBatch(excelEntityList);