修改bug

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,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -87,6 +89,8 @@ public class FirefightersController extends BaseController {
 	FireTeamServiceImpl iFireTeamService;
 	@Autowired
 	RedisUtils redisUtils;
+	@Autowired
+	DataDictionaryServiceImpl dataDictionaryService;
 	@Value("${redis.cache.failure.time}")
 	private long time;
 
@@ -101,6 +105,12 @@ public class FirefightersController extends BaseController {
 	@Transactional
 	public ResponseModel<FirefightersInfoDto> saveFirefighters(@RequestBody FirefightersInfoDto firefighters) {
 		try {
+			/*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao start 2021-10-19*/
+			if (firefighters.getFirefighters().getJobTitleCode() != null){
+				DataDictionary gwmc = dataDictionaryService.getByCode(firefighters.getFirefighters().getJobTitleCode(), "GWMC");
+				firefighters.getFirefighters().setJobTitle(gwmc.getName());
+			}
+			/*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao end 2021-10-19*/
 			iFirefightersService.saveFirefighters(firefighters);
 			return ResponseHelper.buildResponse(firefighters);
 		} catch (Exception e) {
@@ -175,6 +185,12 @@ public class FirefightersController extends BaseController {
 				FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
 				firefighter.setResidence(region.getResult().getRegionName());
 			}
+			/*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao start 2021-10-19*/
+			if (firefighter.getJobTitleCode() != null){
+				DataDictionary gwmc = dataDictionaryService.getByCode(firefighter.getJobTitleCode(), "GWMC");
+				firefighter.setJobTitle(gwmc.getName());
+			}
+			/*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao end 2021-10-19*/
 			if(firefighter.getNativePlace() != null) {
 				FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
 				firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());