Commit b6063166 authored by huyuchen's avatar huyuchen

档案完整监控

parent 0acd4652
...@@ -1631,7 +1631,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1631,7 +1631,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
preEmployeeProject.setContractType(contract.getContractType()); preEmployeeProject.setContractType(contract.getContractType());
preEmployeeProject.setWorkingHours(contract.getWorkingHours()); preEmployeeProject.setWorkingHours(contract.getWorkingHours());
preEmployeeProject.setPost(contract.getPost()); preEmployeeProject.setPost(contract.getPost());
preEmployeeProject.setEnjoinDate(LocalDateTimeUtils.convertLDTToDate(contract.getEnjoinDate())); preEmployeeProject.setEnjoinDate(DateUtil.stringToDate(contract.getCreateTimeStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT));
preEmployeeProject.setTryPeriod(contract.getTryPeriod()); preEmployeeProject.setTryPeriod(contract.getTryPeriod());
preEmployeeProjectMapper.updateById(preEmployeeProject); preEmployeeProjectMapper.updateById(preEmployeeProject);
} }
......
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
ifnull(a.AFTER_EMPLOYMENT,0) AFTER_EMPLOYMENT, ifnull(a.AFTER_EMPLOYMENT,0) AFTER_EMPLOYMENT,
ifnull(a.AFTER_IS_COMPLETE,'0') AFTER_IS_COMPLETE, ifnull(a.AFTER_IS_COMPLETE,'0') AFTER_IS_COMPLETE,
ifnull(a.AFTER_INCOMPLETE_NUM,0) AFTER_INCOMPLETE_NUM, ifnull(a.AFTER_INCOMPLETE_NUM,0) AFTER_INCOMPLETE_NUM,
b.CREATE_NAME as ALERT_USER b.CREATE_USER_NAME as ALERT_USER
from from
t_settle_domain b t_settle_domain b
left join (select DEPT_NO, left join (select DEPT_NO,
......
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