Commit a8e96132 authored by huyuchen's avatar huyuchen

huych-入职登记提交

parent 1faaba31
...@@ -227,46 +227,46 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -227,46 +227,46 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
.eq(EmployeeRegistrationPre::getDeptNo, preVo.getDeptNo()) .eq(EmployeeRegistrationPre::getDeptNo, preVo.getDeptNo())
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
EmployeeRegistrationPre pre = new EmployeeRegistrationPre(); EmployeeRegistrationPre pre = new EmployeeRegistrationPre();
BeanUtils.copyProperties(preVo,pre);
if (Common.isNotNull(preExit)) { if (Common.isNotNull(preExit)) {
BeanUtils.copyProperties(preExit,pre);
pre.setId(preExit.getId()); pre.setId(preExit.getId());
baseMapper.deleteById(preExit); baseMapper.deleteById(preExit);
if (Common.isNotNull(preVo.getServerItem())) { // if (Common.isNotNull(preVo.getServerItem())) {
pre.setServerItem(preVo.getServerItem()); // pre.setServerItem(preVo.getServerItem());
} // }
if (Common.isNotNull(preVo.getFileProvince())) { // if (Common.isNotNull(preVo.getFileProvince())) {
pre.setFileProvince(preVo.getFileProvince()); // pre.setFileProvince(preVo.getFileProvince());
} // }
if (Common.isNotNull(preVo.getFileCity())) { // if (Common.isNotNull(preVo.getFileCity())) {
pre.setFileCity(preVo.getFileCity()); // pre.setFileCity(preVo.getFileCity());
} // }
if (Common.isNotNull(preVo.getFileTown())) { // if (Common.isNotNull(preVo.getFileTown())) {
pre.setFileTown(preVo.getFileTown()); // pre.setFileTown(preVo.getFileTown());
} else { // } else {
pre.setFileTown(null); // pre.setFileTown(null);
} // }
if (Common.isNotNull(preVo.getProvinceCode())) { // if (Common.isNotNull(preVo.getProvinceCode())) {
pre.setProvinceCode(preVo.getProvinceCode()); // pre.setProvinceCode(preVo.getProvinceCode());
} // }
if (Common.isNotNull(preVo.getCityCode())) { // if (Common.isNotNull(preVo.getCityCode())) {
pre.setCityCode(preVo.getCityCode()); // pre.setCityCode(preVo.getCityCode());
} // }
if (Common.isNotNull(preVo.getTownCode())) { // if (Common.isNotNull(preVo.getTownCode())) {
pre.setTownCode(preVo.getTownCode()); // pre.setTownCode(preVo.getTownCode());
} else { // } else {
pre.setTownCode(null); // pre.setTownCode(null);
} // }
if (Common.isNotNull(preVo.getContractType())) { // if (Common.isNotNull(preVo.getContractType())) {
pre.setContractType(preVo.getContractType()); // pre.setContractType(preVo.getContractType());
} // }
if (Common.isNotNull(preVo.getEmpNature())) { // if (Common.isNotNull(preVo.getEmpNature())) {
pre.setEmpNature(preVo.getEmpNature()); // pre.setEmpNature(preVo.getEmpNature());
} // }
if (Common.isNotNull(preVo.getContractSubName())) { // if (Common.isNotNull(preVo.getContractSubName())) {
pre.setContractSubName(preVo.getContractSubName()); // pre.setContractSubName(preVo.getContractSubName());
}else { // }else {
pre.setContractSubName(null); // pre.setContractSubName(null);
} // }
} }
if (Common.isNotNull(preVo.getExpectedCollectionTime())) { if (Common.isNotNull(preVo.getExpectedCollectionTime())) {
pre.setExpectedCollectionTime(LocalDateTimeUtils.dateToLocalDateTime(preVo.getExpectedCollectionTime())); pre.setExpectedCollectionTime(LocalDateTimeUtils.dateToLocalDateTime(preVo.getExpectedCollectionTime()));
......
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