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
750476f1
Commit
750476f1
authored
Oct 30, 2024
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 薪酬导入校验去掉日志打印
parent
5736213d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+3
-8
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+0
-3
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
750476f1
...
...
@@ -322,7 +322,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
TCheckBankNo
checkBankNo
;
for
(
TSalaryEmployee
employee
:
saveNewEmpList
)
{
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
log
.
error
(
"走到了》》》》saveNewEmployeeList"
);
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
&&
(
Common
.
isEmpty
(
employee
.
getSalaryGiveTime
())
...
...
@@ -346,7 +345,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
,
"/tcheckbankno/inner/checkBankNoBatch"
,
bankList
,
CheckBatchVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
checkListR
!=
null
&&
checkListR
.
getData
()
!=
null
)
{
bankMap
=
checkListR
.
getData
().
getCheckMap
();
log
.
error
(
"走到了》》》》bankMap>>{}"
,
bankMap
.
toString
());
}
}
if
(!
phoneList
.
isEmpty
())
{
...
...
@@ -359,7 +357,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
boolean
isFalse
=
false
;
for
(
TSalaryEmployee
employee
:
saveNewEmpList
)
{
log
.
error
(
"走到了》》》》代发户的新员工也校验银行卡号"
);
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
...
...
@@ -367,7 +364,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
||
CommonConstants
.
ZERO_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
&&
Common
.
isNotNull
(
employee
.
getBankNo
()))))
{
if
(
bankMap
.
get
(
employee
.
getBankNo
())
!=
null
)
{
log
.
error
(
"走到了》》》》
校验银行卡号>>{}"
,
bankMap
.
get
(
employee
.
getBankNo
()));
// log.info("走到了》》》》saveNewEmpList---
校验银行卡号>>{}",bankMap.get(employee.getBankNo()));
if
(
Boolean
.
FALSE
.
equals
(
bankMap
.
get
(
employee
.
getBankNo
())))
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
),
"第"
+
(
employee
.
getLineNums
()
)
+
"行:该员工新建失败:【姓名与卡号验证:认证不一致】"
));
isFalse
=
true
;
...
...
@@ -404,7 +401,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
TCheckBankNo
checkBankNo
;
for
(
TSalaryEmployee
employee
:
updateEmployeeBankList
)
{
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
log
.
error
(
"走到了》》》》updateEmployeeBankList"
);
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
)
{
...
...
@@ -431,7 +427,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
TSalaryEmpModLog
empLog
;
List
<
TSalaryEmpModLog
>
saveLogList
=
new
ArrayList
<>();
for
(
TSalaryEmployee
employee
:
updateEmployeeBankList
)
{
log
.
error
(
"走到了》》》》updateEmployeeBankList2"
);
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
//if (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT)) {
...
...
@@ -456,8 +451,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
isFalse
=
true
;
}
}
log
.
error
(
"走到了》》》》updateEmployeeBank校验银行卡号>>{}"
,
bankMap
.
get
(
employee
.
getBankNo
()));
log
.
error
(
"走到了》》》》updateEmployeeBank校验银行卡号>>employee>>{}"
,
employee
.
toString
());
// log.info
("走到了》》》》updateEmployeeBank校验银行卡号>>{}",bankMap.get(employee.getBankNo()));
// log.info
("走到了》》》》updateEmployeeBank校验银行卡号>>employee>>{}",employee.toString());
// 有变更才更新
if
((
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
!
employee
.
getBankNo
().
equals
(
oldEmp
.
getBankNo
()))
||
(
Common
.
isNotNull
(
employee
.
getBankProvince
())
&&
!
employee
.
getBankProvince
().
equals
(
oldEmp
.
getBankProvince
()))
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
750476f1
...
...
@@ -630,15 +630,12 @@ public class SalaryAccountUtil implements Serializable {
}
}
if
(
canSave
)
{
log
.
error
(
"走到了》》》》canSave"
);
// 新增
if
(!
saveNewEmpList
.
isEmpty
())
{
log
.
error
(
"走到了》》》》saveNewEmpList"
);
tSalaryEmployeeService
.
saveNewEmployeeList
(
saveNewEmpList
,
errorList
);
}
// 更新人员信息
if
(!
updateEmpBankList
.
isEmpty
())
{
log
.
error
(
"走到了》》》》updateEmpBankList"
);
tSalaryEmployeeService
.
updateEmployeeBankList
(
updateEmpBankList
,
updateEmpBankMap
,
errorList
);
}
}
...
...
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