Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
e17f4ee2
Commit
e17f4ee2
authored
Sep 06, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.9-社保自动化日志
parent
08dbf6a6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+2
-3
TPreEmpMainMapper.xml
...hives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
e17f4ee2
...
@@ -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
();
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
View file @
e17f4ee2
...
@@ -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,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment