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
014795ae
You need to sign in or sign up before continuing.
Commit
014795ae
authored
Jul 16, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-同步薪资人员信息
parent
b29fa7e1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
16 deletions
+18
-16
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+6
-3
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+12
-13
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
014795ae
...
...
@@ -1148,8 +1148,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return
R
.
failed
(
"新建员工失败!"
);
}
// 更新或新增薪资人员
if
(
Common
.
isNotNull
(
tPreEmployeeInfo
.
getBankNo
())
&&
Common
.
isNotNull
(
tPreEmployeeInfo
.
getTaxMonth
()))
{
if
(
Common
.
isNotNull
(
tPreEmployeeInfo
.
getBankNo
()))
{
TSalaryEmployee
newEmp
=
new
TSalaryEmployee
();
newEmp
.
setFileStatus
(
CommonConstants
.
ZERO_STRING
);
...
...
@@ -1170,7 +1169,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
newEmp
.
setBankProvince
(
tPreEmployeeInfo
.
getBankProvince
());
newEmp
.
setBankCity
(
tPreEmployeeInfo
.
getBankCity
());
newEmp
.
setBankNo
(
tPreEmployeeInfo
.
getBankNo
());
newEmp
.
setTaxMonth
(
tPreEmployeeInfo
.
getTaxMonth
());
String
taxMonth
=
tPreEmployeeInfo
.
getTaxMonth
();
if
(
Common
.
isEmpty
(
tPreEmployeeInfo
.
getTaxMonth
()))
{
taxMonth
=
DateUtil
.
getThisMonth
();
}
newEmp
.
setTaxMonth
(
taxMonth
);
newEmp
.
setBankName
(
tPreEmployeeInfo
.
getBankName
());
newEmp
.
setBankSubName
(
tPreEmployeeInfo
.
getBankSubName
());
newEmp
.
setEmpPhone
(
tPreEmployeeInfo
.
getEmpPhone
());
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
014795ae
...
...
@@ -1098,7 +1098,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
**/
@Override
public
String
savePreNewEmpInfo
(
TSalaryEmployee
newEmp
)
{
//
0表示 未找到薪资记录,C端可编辑
//
true表示 未找到薪资记录,C端可编辑计税月份
boolean
canSaveFlag
=
true
;
TSalaryEmployee
employee
=
baseMapper
.
getByEmpIdCard
(
newEmp
.
getEmpIdcard
());
if
(
employee
!=
null
)
{
...
...
@@ -1108,20 +1108,19 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
canSaveFlag
=
false
;
}
}
if
(
canSaveFlag
)
{
if
(
employee
!=
null
)
{
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"createBy"
,
"createName"
,
"createTime"
};
// 当年有发薪纪录,不允许编辑计税月
if
(!
canSaveFlag
)
{
newEmp
.
setTaxMonth
(
employee
.
getTaxMonth
());
}
// 变更日志 hgw 2024-7-16 18:19:57
logService
.
initModLog
(
employee
,
newEmp
,
CommonConstants
.
THREE_STRING
,
newEmp
.
getCreateName
(),
null
);
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"createBy"
,
"createName"
,
"createTime"
};
BeanUtil
.
copyProperties
(
newEmp
,
employee
,
ignoreProperties
);
this
.
updateById
(
employee
);
}
else
{
this
.
save
(
newEmp
);
}
}
return
CommonConstants
.
SAVE_SUCCESS
;
}
...
...
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