Commit 2fddaa3c authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_先删后加

parent e088360a
......@@ -1729,15 +1729,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
preEmpMain.setAuditId(user.getId());
preEmpMain.setAuditRemark(auditRemark);
preEmpMain.setAuditName(user.getNickname());
preEmpMain.setAuditTime(new Date());
if (CommonConstants.FOUR_STRING.equals(status)) {
preEmpMain.setAuditTime(new Date());
}
// 审核日志
TPreEmpMainLog auditLog = new TPreEmpMainLog();
auditLog.setAuditId(user.getId());
auditLog.setAuditName(user.getNickname());
if (CommonConstants.FOUR_STRING.equals(status)) {
auditLog.setAuditTime(new Date());
}
auditLog.setAuditTime(new Date());
auditLog.setAuditRemark(auditRemark);
auditLog.setMainId(preEmpMain.getId());
auditLog.setAuditResult(status);
......@@ -1796,7 +1796,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
preEmpMain.setAuditId(user.getId());
preEmpMain.setAuditRemark(auditRemark);
preEmpMain.setAuditName(user.getNickname());
preEmpMain.setAuditTime(new Date());
if (CommonConstants.FOUR_STRING.equals(status)) {
preEmpMain.setAuditTime(new Date());
}
// 审核日志
TPreEmpMainLog auditLog = new TPreEmpMainLog();
......
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