bug 6722

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Firefighters.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Transient;
 
 import java.util.Date;
 /**
@@ -77,6 +78,10 @@ public class Firefighters extends BaseEntity {
     @ApiModelProperty(value = "现居住地详情")
     private String residenceDetails;
 
+    @ApiModelProperty(value = "现居住地详情")
+    @TableField(exist = false)
+    private String residenceDetailsCode;
+
     @ApiModelProperty(value = "机场住宿情况")
     private String airportAccommodation;
 
@@ -130,6 +135,10 @@ public class Firefighters extends BaseEntity {
     @ApiModelProperty(value = "户籍所在地详细地址")
     private String nativePlaceVal;
 
+    @ApiModelProperty(value = "籍贯/户口所在地")
+    @TableField(exist = false)
+    private String nativePlaceCode;
+
     @ApiModelProperty(value = "现居住地详细地址")
     private String residenceDetailVal;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -692,10 +692,10 @@ GROUP BY
     max(case field_code when 'nation' then field_value end)                     nation,
     max(case field_code when 'birthdayTime' then field_value end)                     birthdayTime,
     max(case field_code when 'maritalStatus' then field_value end)                     maritalStatus,
-    max(case field_code when 'nativePlace' then field_value_label end)                     nativePlace,
+    max(case field_code when 'nativePlaceCode' then field_value_label end)                     nativePlace,
     max(case field_code when 'nativePlaceVal' then field_value end)                     nativePlaceVal,
     max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
-    max(case field_code when 'residenceDetails' then field_value_label end)                     residenceDetails,
+    max(case field_code when 'residenceDetailsCode' then field_value_label end)                     residenceDetails,
     max(case field_code when 'residenceDetailVal' then field_value end)                     residenceDetailVal,
     max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
     FROM cb_dynamic_form_instance GROUP BY instance_id) b

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

@@ -458,14 +458,14 @@ public class FirefightersController extends BaseController {
                     firefighter.setMobilePhone(peopleBasicInfoDto.getTelephone());
                     firefighter.setCertificateNumber(peopleBasicInfoDto.getCertificatesNumber());
                     // BUG2168 居住地户籍所在地为空判断 bykongfm
-                    if (!ObjectUtils.isEmpty(firefighter.getResidenceDetails())) {
-                        FeignClientResult<RegionModel> region = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+                    if (!ObjectUtils.isEmpty(firefighter.getResidenceDetailsCode())) {
+                        FeignClientResult<RegionModel> region = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetailsCode()));
                         firefighter.setResidence(region.getResult().getRegionName());
                     }
 
                     /*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao end 2021-10-19*/
-                    if (!ObjectUtils.isEmpty(firefighter.getNativePlace())) {
-                        FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
+                    if (!ObjectUtils.isEmpty(firefighter.getNativePlaceCode())) {
+                        FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlaceCode()));
                         firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
                     }
                     if (ObjectUtils.isEmpty(firefighter.getCompany())) {