Commit 7a3047be authored by hongguangwu's avatar hongguangwu

MVP1.7.17-离职待办-优化代码

parent c5d9f242
...@@ -1087,6 +1087,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1087,6 +1087,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
vo.setReasonType(leave.getLeaveReasonId()); vo.setReasonType(leave.getLeaveReasonId());
vo.setTrustRemark(leave.getSocialTrustRemark()); vo.setTrustRemark(leave.getSocialTrustRemark());
vo.setChangeContractAndEmployee(CommonConstants.ONE_STRING); vo.setChangeContractAndEmployee(CommonConstants.ONE_STRING);
if (Common.isNotNull(leave.getJoinLeaveDate())) {
try {
vo.setLeaveDate(DateUtil.parseDate(leave.getJoinLeaveDate(), DateUtil.ISO_EXPANDED_DATE_FORMAT));
} catch (Exception e) {
}
}
socialOldList.add(vo); socialOldList.add(vo);
} }
if ((Common.isEmpty(doType) || doType.contains(CommonConstants.TWO_STRING)) if ((Common.isEmpty(doType) || doType.contains(CommonConstants.TWO_STRING))
...@@ -1109,6 +1115,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1109,6 +1115,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
vo.setReasonType(leave.getLeaveReasonId()); vo.setReasonType(leave.getLeaveReasonId());
vo.setTrustRemark(leave.getFundTrustRemark()); vo.setTrustRemark(leave.getFundTrustRemark());
vo.setChangeContractAndEmployee(CommonConstants.ONE_STRING); vo.setChangeContractAndEmployee(CommonConstants.ONE_STRING);
if (Common.isNotNull(leave.getJoinLeaveDate())) {
try {
vo.setLeaveDate(DateUtil.parseDate(leave.getJoinLeaveDate(), DateUtil.ISO_EXPANDED_DATE_FORMAT));
} catch (Exception e) {
}
}
fundOldList.add(vo); fundOldList.add(vo);
} }
if ((Common.isEmpty(doType) || doType.contains(CommonConstants.THREE_STRING)) if ((Common.isEmpty(doType) || doType.contains(CommonConstants.THREE_STRING))
......
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