Commit e17f4ee2 authored by hongguangwu's avatar hongguangwu

MVP1.6.9-社保自动化日志

parent 08dbf6a6
...@@ -2086,9 +2086,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2086,9 +2086,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
preEmpMain.setAuditId(user.getId()); preEmpMain.setAuditId(user.getId());
preEmpMain.setAuditRemark(auditRemark); preEmpMain.setAuditRemark(auditRemark);
preEmpMain.setAuditName(user.getNickname()); preEmpMain.setAuditName(user.getNickname());
if (CommonConstants.FOUR_STRING.equals(status)) { // 2024-9-6 17:32:00 倩倩与 王成沟通,变更为审核时间,且审核通过与不通过的时候显示
preEmpMain.setAuditTime(new Date()); preEmpMain.setAuditTime(new Date());
}
// 审核日志 // 审核日志
TPreEmpMainLog auditLog = new TPreEmpMainLog(); TPreEmpMainLog auditLog = new TPreEmpMainLog();
......
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
concat(a.BUSINESS_PRIMARY_TYPE,'-',ifnull(a.BUSINESS_SECOND_TYPE,''),'-',ifnull(a.BUSINESS_THIRD_TYPE,'')) BUSINESS_TYPE, concat(a.BUSINESS_PRIMARY_TYPE,'-',ifnull(a.BUSINESS_SECOND_TYPE,''),'-',ifnull(a.BUSINESS_THIRD_TYPE,'')) BUSINESS_TYPE,
a.EMP_NATRUE, a.EMP_NATRUE,
a.AUDIT_ID, a.AUDIT_ID,
a.AUDIT_NAME, if(a.STATUS in ('3','4'),a.AUDIT_NAME,'') AUDIT_NAME,
a.AUDIT_TIME, if(a.STATUS in ('3','4'),a.AUDIT_TIME,'') AUDIT_TIME,
a.CREATE_BY, a.CREATE_BY,
a.UPDATE_BY, a.UPDATE_BY,
a.CREATE_NAME, a.CREATE_NAME,
......
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