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
8299e40d
Commit
8299e40d
authored
Oct 22, 2024
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 薪酬的薪资导入——配置代发户的项目需进行银行卡号验证
parent
7037d7d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
23 deletions
+38
-23
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+31
-23
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+7
-0
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
8299e40d
...
...
@@ -306,7 +306,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
@Override
public
String
saveNewSalaryEmployee
(
boolean
notLabour
,
TSalaryEmployee
employee
)
{
String
pre
=
this
.
checkNewEmpBankAndPhone
(
employee
,
false
);
if
(
pre
!=
null
)
return
pre
;
if
(
pre
!=
null
)
{
return
pre
;}
if
(
notLabour
)
{
this
.
save
(
employee
);
}
...
...
@@ -321,8 +321,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
List
<
String
>
phoneList
=
new
ArrayList
<>();
TCheckBankNo
checkBankNo
;
for
(
TSalaryEmployee
employee
:
saveNewEmpList
)
{
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
))
//
&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
&&
(
Common
.
isEmpty
(
employee
.
getSalaryGiveTime
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
&&
Common
.
isNotNull
(
employee
.
getBankNo
()))))
{
...
...
@@ -356,8 +357,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
boolean
isFalse
=
false
;
for
(
TSalaryEmployee
employee
:
saveNewEmpList
)
{
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
))
//
&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
&&
(
Common
.
isEmpty
(
employee
.
getSalaryGiveTime
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
&&
Common
.
isNotNull
(
employee
.
getBankNo
()))))
{
...
...
@@ -397,8 +399,10 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
List
<
TCheckBankNo
>
bankList
=
new
ArrayList
<>();
TCheckBankNo
checkBankNo
;
for
(
TSalaryEmployee
employee
:
updateEmployeeBankList
)
{
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
)))
{
//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
)
{
checkBankNo
=
new
TCheckBankNo
();
checkBankNo
.
setName
(
employee
.
getEmpName
());
checkBankNo
.
setBankNo
(
employee
.
getBankNo
());
...
...
@@ -423,7 +427,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
List
<
TSalaryEmpModLog
>
saveLogList
=
new
ArrayList
<>();
for
(
TSalaryEmployee
employee
:
updateEmployeeBankList
)
{
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
if
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
))
{
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
//if (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT)) {
oldEmp
=
updateEmpBankMap
.
get
(
employee
.
getEmpIdcard
());
if
(
oldEmp
!=
null
)
{
if
(
Common
.
isNotNull
(
employee
.
getBankProvince
()))
{
...
...
@@ -471,23 +476,24 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
}
else
if
(
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ONE_INT
)
&&
Common
.
isNotNull
(
employee
.
getBankProvince
()))
{
areaProvince
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
employee
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaProvince
))
{
if
(
Common
.
isNotNull
(
employee
.
getBankCity
()))
{
areaCity
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
employee
.
getBankCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
employee
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaCity
))
{
employee
.
setBankCity
(
areaCity
);
}
else
{
employee
.
setBankCity
(
null
);
}
}
employee
.
setBankProvince
(
areaProvince
);
}
else
{
employee
.
setBankProvince
(
null
);
}
}
//}
// else if (employee.getIssueStatus().equals(CommonConstants.ONE_INT) && Common.isNotNull(employee.getBankProvince())) {
// areaProvince = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankProvince().trim());
// if (Common.isNotNull(areaProvince)) {
// if (Common.isNotNull(employee.getBankCity())) {
// areaCity = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankCity().trim()
// + CommonConstants.DOWN_LINE_STRING + employee.getBankProvince().trim());
// if (Common.isNotNull(areaCity)) {
// employee.setBankCity(areaCity);
// } else {
// employee.setBankCity(null);
// }
// }
// employee.setBankProvince(areaProvince);
// } else {
// employee.setBankProvince(null);
// }
// }
}
}
for
(
TSalaryEmployee
employee
:
updateEmployeeBankList
)
{
...
...
@@ -557,7 +563,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
// 银行卡
// 代发户的,不校验卡号,下次使用的时候校验卡号
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
)))
{
// todo cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
//if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
// 调用校验服务
TCheckBankNo
checkBankNo
=
new
TCheckBankNo
();
checkBankNo
.
setName
(
employee
.
getEmpName
());
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
8299e40d
...
...
@@ -278,6 +278,7 @@ 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
))
{
isNewEmployee
=
true
;
...
...
@@ -555,6 +556,7 @@ public class SalaryAccountUtil implements Serializable {
otherEmp
=
otherEmpMap
.
get
(
newEmps
.
getEmpIdcard
());
if
(
otherEmp
==
null
)
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
entity
.
getIsNewEmployee
()))
{
// 赋值新员工信息
if
(!
this
.
setNewEmpBase
(
newEmps
,
newEmps
.
getLineNums
()
+
dataRow
,
errorList
,
notLabour
,
entity
,
salaryType
,
dept
,
user
,
entity
.
getSalaryStyle
()
,
CommonConstants
.
ZERO_STRING
.
equals
(
entity
.
getSalaryGiveTime
()),
invoiceTitle
...
...
@@ -731,6 +733,11 @@ public class SalaryAccountUtil implements Serializable {
checkBankInfoEmpList
.
add
(
emp
);
}
// cyx-mvp1.7.0: 新增:本次是代发户,是新员工,要校验银行卡
// if (isIssue == 1 && isNewEmployee && Common.isNotNull(emp.getBankNo())) {
// checkBankInfoEmpList.add(emp);
// }
entity
.
setEmpId
(
emp
.
getId
());
entity
.
setEmpIdcard
(
emp
.
getEmpIdcard
());
entity
.
setEmpName
(
emp
.
getEmpName
());
...
...
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