Commit fd522d4d authored by huyuchen's avatar huyuchen

huych-入职确认信息编辑提交

parent c4979969
...@@ -451,7 +451,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -451,7 +451,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
.in(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11")) .in(TEmployeeContractPre::getProcessStatus, Arrays.asList("0","1","3","5","7","10","11"))
.eq(TEmployeeContractPre::getId,contractOld.getId())); .eq(TEmployeeContractPre::getId,contractOld.getId()));
} }
if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null) { if (newInfo.getServerItem().contains("合同") && contractOld != null && employeeContractPre != null
&& null != newInfo.getContractUpdateFlag() && newInfo.getContractUpdateFlag()) {
//1.9.11 huych 附件类型不比较差异 //1.9.11 huych 附件类型不比较差异
contractOld.setAttaList(null); contractOld.setAttaList(null);
employeeContractPre.setAttaList(null); employeeContractPre.setAttaList(null);
...@@ -630,7 +631,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -630,7 +631,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} }
} }
//保存合同待签订数据 //保存合同待签订数据
if (newInfo.getServerItem().contains("合同") && employeeContractPre != null) { if (newInfo.getServerItem().contains("合同") && employeeContractPre != null
&& null != newInfo.getContractUpdateFlag() && newInfo.getContractUpdateFlag()) {
TEmployeeContractPreVo preVo = new TEmployeeContractPreVo(); TEmployeeContractPreVo preVo = new TEmployeeContractPreVo();
BeanUtils.copyProperties(employeeContractPre,preVo); BeanUtils.copyProperties(employeeContractPre,preVo);
if (Common.isNotNull(employeeContractPre.getExpectedCollectionTime()) ) { if (Common.isNotNull(employeeContractPre.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