修复BUG2704

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

@@ -83,10 +83,14 @@ public class FirefightersExcelDto extends BaseDto {
     @ApiModelProperty(value = "婚姻状况")
     private String maritalStatus;
 
-    @ExcelProperty(value = "户籍所在地", index = 10)
+    @ExcelIgnore
     @ApiModelProperty(value = "籍贯/户口所在地")
     private String nativePlace;
 
+    @ExcelProperty(value = "户籍所在地", index = 10)
+    @ApiModelProperty(value = "籍贯/户口所在地的值")
+    private String nativePlaceValue;
+
     @ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
     @ExcelProperty(value = "政治面貌", index = 11)
     @ApiModelProperty(value = "政治面貌代码")

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

@@ -119,4 +119,7 @@ public class Firefighters extends BaseEntity {
 
     @ApiModelProperty(value = "机构名称")
     private String companyName;
+
+    @ApiModelProperty(value = "籍贯/户口所在地的值")
+    private String nativePlaceValue;
 }

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

@@ -68,10 +68,12 @@
           and a.sequence_nbr=#{id}
     </select>
 
+
+    <!-- BUG3553 BY kongfm 人员关系显示汉字-->
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto">
         select f.*,
        (select  cb_fire_team.name  from  cb_fire_team where cb_fire_team.sequence_nbr=f.fire_team_id) fireTeam,
-        emergency_contact, relationship, emergency_contact_phone
+        emergency_contact, (select da.name from cb_data_dictionary da where da.code = fc.relationship) as relationship , emergency_contact_phone
         from cb_firefighters f
                  left join cb_firefighters_contacts fc on f.sequence_nbr = fc.firefighters_id
         where f.is_delete = #{isDelete}

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

@@ -8,6 +8,9 @@ import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
@@ -61,6 +64,11 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     @Override
     public void saveFirefighters(FirefightersInfoDto firefighters) {
         Firefighters firefighter = firefighters.getFirefighters();
+        // 现居住地保存地址信息 户籍所在地信息 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()));
+        firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
         save(firefighter);
         FirefightersContacts firefightersContact = firefighters.getFirefightersContacts();
         firefightersContact.setFirefightersId(firefighter.getSequenceNbr());

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

@@ -6,6 +6,9 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+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.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -156,6 +159,10 @@ public class FirefightersController extends BaseController {
 			@RequestBody FirefightersInfoDto firefighters) {
 		try {
 			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()));
+			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
 			iFirefightersService.updateById(firefighter);
 			ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
 			// 删除缓存

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -258,4 +258,13 @@
 				ALTER TABLE `cb_water_resource` modify latitude double(18,14) COMMENT '纬度';
 		</sql>
 	</changeSet>
+	<changeSet author="kongfm" id="2021-09-03-kongfm-1">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="cb_firefighters"/>
+		</preConditions>
+		<comment>modify table cb_firefighters add several columns</comment>
+		<sql>
+			ALTER TABLE `cb_firefighters` add native_place_value varchar(255) COMMENT '户籍所在地的值';
+		</sql>
+	</changeSet>
 </databaseChangeLog>