Commit be351b19 authored by xixinzhao's avatar xixinzhao

修改人员岗位页签字段长度

parent 108121b3
...@@ -459,11 +459,7 @@ public class FirefightersController extends BaseController { ...@@ -459,11 +459,7 @@ public class FirefightersController extends BaseController {
FeignClientResult<RegionModel> region = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails())); FeignClientResult<RegionModel> region = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
firefighter.setResidence(region.getResult().getRegionName()); firefighter.setResidence(region.getResult().getRegionName());
} }
/*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao start 2021-10-19*/
if (!ObjectUtils.isEmpty(firefighter.getJobTitleCode())) {
DataDictionary gwmc = dataDictionaryService.getByCode(firefighter.getJobTitleCode(), "GWMC");
firefighter.setJobTitle(gwmc.getName());
}
/*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao end 2021-10-19*/ /*3184 消防人员,编辑页面岗位选择子分类保存成功后,概要中岗位未修改 chenzhao end 2021-10-19*/
if (!ObjectUtils.isEmpty(firefighter.getNativePlace())) { if (!ObjectUtils.isEmpty(firefighter.getNativePlace())) {
FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace())); FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
......
...@@ -3155,5 +3155,29 @@ ...@@ -3155,5 +3155,29 @@
ALTER TABLE jc_power_transfer_company_resources ADD arrival_time varchar(255) NULL COMMENT '车辆到场时间'; ALTER TABLE jc_power_transfer_company_resources ADD arrival_time varchar(255) NULL COMMENT '车辆到场时间';
</sql> </sql>
</changeSet> </changeSet>
<changeSet id="20220606-xxz-2" author="xxz">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_firefighters_post"/>
</preConditions>
<comment>修改数据库cb_firefighters_post表字段长度</comment>
<sql>
ALTER TABLE cb_firefighters_post MODIFY COLUMN job_title text CHARACTER SET utf8 DEFAULT NULL COMMENT '岗位名称';
ALTER TABLE cb_firefighters_post MODIFY COLUMN job_title_code text CHARACTER SET utf8 DEFAULT NULL COMMENT '岗位数据字典code';
ALTER TABLE cb_firefighters_post MODIFY COLUMN certificate_type VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '持证类别';
ALTER TABLE cb_firefighters_post MODIFY COLUMN certificate_type_code VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '持证类别-code';
</sql>
</changeSet>
<changeSet id="20220606-xxz-3" author="xxz">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_firefighters"/>
</preConditions>
<comment>修改数据库cb_firefighters_post表字段长度</comment>
<sql>
ALTER TABLE cb_firefighters MODIFY COLUMN job_title text CHARACTER SET utf8 DEFAULT NULL COMMENT '岗位名称';
ALTER TABLE cb_firefighters MODIFY COLUMN job_title_code text CHARACTER SET utf8 DEFAULT NULL COMMENT '岗位数据字典code';
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment