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
dae61488
Commit
dae61488
authored
Oct 23, 2024
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 薪酬导入校验去掉todo
parent
b6a75d4b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+1
-1
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+2
-5
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
dae61488
...
...
@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
// 银行卡
// 代发户的,不校验卡号,下次使用的时候校验卡号
//
todo
cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
// cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
//if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
// 调用校验服务
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
dae61488
...
...
@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable {
newEmp
.
setEmpName
(
empName
);
}
// todo cyx-mvp1.7.0修复:去掉重复判断
if
((
SalaryConstants
.
IF_NEW_EMPLOYEE
.
equals
(
dbFiedName
)
||
SalaryConstants
.
IS_NEW_EMPLOYEE
.
equals
(
dbFiedName
))
&&
SalaryConstants
.
IS_NEW
.
equals
(
cellValueStr
))
{
// cyx-mvp1.7.0修复:去掉重复判断
if
(
SalaryConstants
.
IF_NEW_EMPLOYEE
.
equals
(
dbFiedName
)
&&
SalaryConstants
.
IS_NEW
.
equals
(
cellValueStr
))
{
isNewEmployee
=
true
;
entity
.
setIsNewEmployee
(
CommonConstants
.
ONE_STRING
);
}
...
...
@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable {
}
if
(
canSave
)
{
log
.
error
(
"走到了》》》》canSave"
);
log
.
error
(
"走到了》》》》saveNewEmpList>>>{}"
,
saveNewEmpList
.
toString
());
// 新增
if
(!
saveNewEmpList
.
isEmpty
())
{
log
.
error
(
"走到了》》》》saveNewEmpList"
);
tSalaryEmployeeService
.
saveNewEmployeeList
(
saveNewEmpList
,
errorList
);
}
log
.
error
(
"走到了》》》》updateEmpBankList>>>{}"
,
updateEmpBankList
.
toString
());
// 更新人员信息
if
(!
updateEmpBankList
.
isEmpty
())
{
log
.
error
(
"走到了》》》》updateEmpBankList"
);
...
...
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