消防专家模板增添 籍贯 现居住地 获取地址对应code值的方法

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

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