Skip to content

A
amos-boot-biz
Commit 24e49460 authored by KeYong's avatar KeYong
Browse files
Options

修改单位bug

parent 3b7e3eeb
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 9 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ 24e49460
...@@ -118,7 +118,9 @@ public class OrgUsrController extends BaseController { ...@@ -118,7 +118,9 @@ public class OrgUsrController extends BaseController {
QueryWrapper<CompanyInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<CompanyInfo> queryWrapper = new QueryWrapper<>();
CompanyInfo info = fireCompanyInfoServiceImpl.getOne(queryWrapper.eq("instance_id", id).eq("is_delete", 0)); CompanyInfo info = fireCompanyInfoServiceImpl.getOne(queryWrapper.eq("instance_id", id).eq("is_delete", 0));
info.setIsDelete(true); if (!ValidationUtil.isEmpty(info)) {
info.setIsDelete(true);
}
fireCompanyInfoServiceImpl.updateById(info); fireCompanyInfoServiceImpl.updateById(info);
// 删除时，只作逻辑删除 // 删除时，只作逻辑删除
// BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
......
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
View file @ 24e49460
...@@ -221,7 +221,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi ...@@ -221,7 +221,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
} }
// 2.更新岗位 // 2.更新岗位
orgUsrService.saveFirefightersPost(peopleInfoDto.getPostEduDtoObj()); orgUsrService.saveFirefightersPost(peopleInfoDto.getPostEduDtoObj(), id);
// 3.消防人员更新消防表 // 3.消防人员更新消防表
if ("1".equals(peopleInfoDto.getFirefighters().getPeopleType())){ if ("1".equals(peopleInfoDto.getFirefighters().getPeopleType())){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 24e49460
...@@ -888,6 +888,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -888,6 +888,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr parent = getById(OrgUsrVo.getParentId()); OrgUsr parent = getById(OrgUsrVo.getParentId());
if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) { if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
orgUsr.setParentName(parent.getBizOrgName());
} }
} else { } else {
orgUsr.setBizOrgCode(getOrgCodeStr()); orgUsr.setBizOrgCode(getOrgCodeStr());
...@@ -950,6 +951,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -950,6 +951,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
// 修改单位信息 // 修改单位信息
OrgUsr orgUsr = new OrgUsr(); OrgUsr orgUsr = new OrgUsr();
OrgUsr oriOrgUsr = getById(id); OrgUsr oriOrgUsr = getById(id);
orgUsrVo.setBizOrgCode(oriOrgUsr.getBizOrgCode());
BeanUtils.copyProperties(orgUsrVo, orgUsr); BeanUtils.copyProperties(orgUsrVo, orgUsr);
// 判断是否修改所属单位 // 判断是否修改所属单位
if (!(oriOrgUsr.getParentId() != null ? oriOrgUsr.getParentId() : "").equals(orgUsrVo.getParentId())) { if (!(oriOrgUsr.getParentId() != null ? oriOrgUsr.getParentId() : "").equals(orgUsrVo.getParentId())) {
...@@ -2752,7 +2754,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -2752,7 +2754,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
saveFirefightersContacts(peopleInfoDto); saveFirefightersContacts(peopleInfoDto);
} }
// 4.保存岗位信息 // 4.保存岗位信息
saveFirefightersPost(peopleInfoDto.getPostEduDtoObj()); saveFirefightersPost(peopleInfoDto.getPostEduDtoObj(), orgUsr.getSequenceNbr());
return peopleInfoDto; return peopleInfoDto;
} }
...@@ -2844,7 +2846,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -2844,7 +2846,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
peopleInfoDto.getPostEduDtoObj().getFirefightersWorkexperience().setFirefightersId(sequenceNbr); peopleInfoDto.getPostEduDtoObj().getFirefightersWorkexperience().setFirefightersId(sequenceNbr);
} }
public void saveFirefightersPost(FirefightersDataDto firefightersDataDto){ public void saveFirefightersPost(FirefightersDataDto firefightersDataDto, Long id){
QueryWrapper queryWrapper = new QueryWrapper<>(); QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("org_usr_id", firefightersDataDto.getFirefightersPost().getOrgUsrId()); queryWrapper.eq("org_usr_id", firefightersDataDto.getFirefightersPost().getOrgUsrId());
FirefightersPost firefightersPost = iFirefightersPostService.getOne(queryWrapper); FirefightersPost firefightersPost = iFirefightersPostService.getOne(queryWrapper);
...@@ -2857,20 +2859,23 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -2857,20 +2859,23 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
} }
/*bug3071 消防人员，专家领域选择子分类时概要信息中专家领域未显示 2021-10-09 chenzhao */ /*bug3071 消防人员，专家领域选择子分类时概要信息中专家领域未显示 2021-10-09 chenzhao */
if (firefightersPost == null) { if (firefightersPost == null) {
firefightersDataDto.getFirefightersPost().setOrgUsrId(String.valueOf(id));
iFirefightersPostService.save(firefightersDataDto.getFirefightersPost()); iFirefightersPostService.save(firefightersDataDto.getFirefightersPost());
} else { } else {
iFirefightersPostService.update(firefightersDataDto.getFirefightersPost(), queryWrapper); iFirefightersPostService.update(firefightersDataDto.getFirefightersPost(), queryWrapper);
} }
FirefightersEducation firefightersEducation= ifirefightersEducationService.getOne(queryWrapper); FirefightersEducation firefightersEducation = ifirefightersEducationService.getOne(queryWrapper);
if(firefightersEducation==null) { if(firefightersEducation == null) {
firefightersDataDto.getFirefightersEducation().setOrgUsrId(String.valueOf(id));
ifirefightersEducationService.save(firefightersDataDto.getFirefightersEducation()); ifirefightersEducationService.save(firefightersDataDto.getFirefightersEducation());
}else { }else {
ifirefightersEducationService.update(firefightersDataDto.getFirefightersEducation(),queryWrapper); ifirefightersEducationService.update(firefightersDataDto.getFirefightersEducation(),queryWrapper);
} }
FirefightersWorkexperience firefightersWorkexperience = ifirefightersWorkexperienceService.getOne(queryWrapper); FirefightersWorkexperience firefightersWorkexperience = ifirefightersWorkexperienceService.getOne(queryWrapper);
if(firefightersWorkexperience==null) { if(firefightersWorkexperience == null) {
firefightersDataDto.getFirefightersWorkexperience().setOrgUsrId(String.valueOf(id));
ifirefightersWorkexperienceService.save(firefightersDataDto.getFirefightersWorkexperience()); ifirefightersWorkexperienceService.save(firefightersDataDto.getFirefightersWorkexperience());
}else { }else {
ifirefightersWorkexperienceService.update(firefightersDataDto.getFirefightersWorkexperience(),queryWrapper); ifirefightersWorkexperienceService.update(firefightersDataDto.getFirefightersWorkexperience(),queryWrapper);
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 24e49460
...@@ -2891,7 +2891,9 @@ ...@@ -2891,7 +2891,9 @@
<changeSet author="ky" id="1651110136-1"> <changeSet author="ky" id="1651110136-1">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" /> <tableExists tableName="cb_data_dictionary" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/> <not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</not>
</preConditions> </preConditions>
<comment>Add data to cb_data_dictionary</comment> <comment>Add data to cb_data_dictionary</comment>
<sql> <sql>
...@@ -3088,5 +3090,27 @@ ...@@ -3088,5 +3090,27 @@
</sql> </sql>
</changeSet> </changeSet>
<changeSet id="1652860932-1" author="ky">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_firefighters_post"/>
</preConditions>
<comment>修改数据库cb_firefighters_post表字段长度</comment>
<sql>
ALTER TABLE cb_firefighters_post MODIFY COLUMN administrative_position VARCHAR(225) DEFAULT NULL COMMENT '行政职务';
ALTER TABLE cb_firefighters_post MODIFY COLUMN post_qualification VARCHAR(225) DEFAULT NULL COMMENT '岗位资质';
ALTER TABLE cb_firefighters_post MODIFY COLUMN employee_hierarchy_code VARCHAR(50) DEFAULT NULL COMMENT '员工层级code';
ALTER TABLE cb_firefighters_post MODIFY COLUMN administrative_position_code VARCHAR(225) DEFAULT NULL COMMENT '行政职务code';
ALTER TABLE cb_firefighters_post MODIFY COLUMN post_qualification_code VARCHAR(225) DEFAULT NULL COMMENT '岗位资质code';
ALTER TABLE cb_firefighters_post MODIFY COLUMN job_title VARCHAR(225) DEFAULT NULL COMMENT '岗位名称';
ALTER TABLE cb_firefighters_post MODIFY COLUMN job_title_code VARCHAR(100) DEFAULT NULL COMMENT '岗位数据字典code';
ALTER TABLE cb_firefighters_post MODIFY COLUMN internal_position VARCHAR(100) DEFAULT NULL COMMENT '消防管理组织机构内部职务';
ALTER TABLE cb_firefighters_post MODIFY COLUMN internal_position_code VARCHAR(100) DEFAULT NULL COMMENT '消防管理组织机构内部职务-code';
ALTER TABLE cb_firefighters_post MODIFY COLUMN fire_management_post VARCHAR(225) DEFAULT NULL COMMENT '消防管理岗位';
ALTER TABLE cb_firefighters_post MODIFY COLUMN fire_management_post_code VARCHAR(225) DEFAULT NULL COMMENT '消防管理岗位-code';
ALTER TABLE cb_firefighters_post MODIFY COLUMN certificate_type VARCHAR(100) DEFAULT NULL COMMENT '持证类别';
ALTER TABLE cb_firefighters_post MODIFY COLUMN certificate_type_code VARCHAR(100) 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