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
269c6cca
Commit
269c6cca
authored
Oct 22, 2024
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 薪酬的薪资导入——加日志
parent
d511ed7a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+12
-9
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+3
-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 @
269c6cca
...
...
@@ -342,12 +342,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
Map
<
String
,
Boolean
>
bankMap
=
new
HashMap
<>();
Map
<
String
,
Boolean
>
phoneMap
=
new
HashMap
<>();
if
(!
bankList
.
isEmpty
())
{
log
.
error
(
"走到了》》》》批量校验 卡号
与手机号
"
);
log
.
error
(
"走到了》》》》批量校验 卡号"
);
R
<
CheckBatchVo
>
checkListR
=
HttpDaprUtil
.
invokeMethodPost
(
checkProperties
.
getAppUrl
(),
checkProperties
.
getAppId
()
,
"/tcheckbankno/inner/checkBankNoBatch"
,
bankList
,
CheckBatchVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
checkListR
!=
null
&&
checkListR
.
getData
()
!=
null
)
{
bankMap
=
checkListR
.
getData
().
getCheckMap
();
log
.
error
(
"走到了》》》》bankMap"
,
bankMap
.
toString
());
log
.
error
(
"走到了》》》》bankMap
>>{}
"
,
bankMap
.
toString
());
}
}
if
(!
phoneList
.
isEmpty
())
{
...
...
@@ -368,7 +368,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
.
error
(
"走到了》》》》校验银行卡号
>>{}
"
,
bankMap
.
get
(
employee
.
getBankNo
()));
if
(
Boolean
.
FALSE
.
equals
(
bankMap
.
get
(
employee
.
getBankNo
())))
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
),
"第"
+
(
employee
.
getLineNums
()
)
+
"行:该员工新建失败:【姓名与卡号验证:认证不一致】"
));
isFalse
=
true
;
...
...
@@ -405,6 +405,7 @@ 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))
)
{
...
...
@@ -428,9 +429,10 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
String
areaCity
;
TSalaryEmployee
oldEmp
;
ExcelUtil
<
TSalaryEmployee
>
util
=
new
ExcelUtil
<>(
TSalaryEmployee
.
class
);
TSalaryEmpModLog
l
og
;
TSalaryEmpModLog
empL
og
;
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)) {
...
...
@@ -455,7 +457,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
isFalse
=
true
;
}
}
log
.
error
(
"走到了》》》》updateEmployeeBank校验银行卡号>>{}"
,
bankMap
.
get
(
employee
.
getBankNo
()));
log
.
error
(
"走到了》》》》updateEmployeeBank校验银行卡号>>employee>>{}"
,
employee
.
toString
());
// 有变更才更新
if
((
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
!
employee
.
getBankNo
().
equals
(
oldEmp
.
getBankNo
()))
||
(
Common
.
isNotNull
(
employee
.
getBankProvince
())
&&
!
employee
.
getBankProvince
().
equals
(
oldEmp
.
getBankProvince
()))
...
...
@@ -473,9 +476,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
isFalse
=
true
;
}
if
(!
isFalse
)
{
l
og
=
logService
.
checkEditToLog
(
employee
,
oldEmp
,
CommonConstants
.
FOUR_STRING
,
employee
.
getCreateName
(),
util
);
if
(
l
og
!=
null
)
{
saveLogList
.
add
(
l
og
);
empL
og
=
logService
.
checkEditToLog
(
employee
,
oldEmp
,
CommonConstants
.
FOUR_STRING
,
employee
.
getCreateName
(),
util
);
if
(
empL
og
!=
null
)
{
saveLogList
.
add
(
empL
og
);
}
}
...
...
@@ -1177,7 +1180,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
TSalaryEmployee
old
=
baseMapper
.
selectById
(
tSalaryEmployee
.
getId
());
// 2024-2-4 16:05:56 hgw 银行卡需要校验
String
pre
=
getCheckBankNo
(
tSalaryEmployee
,
old
);
if
(
pre
!=
null
)
return
R
.
failed
(
pre
);
if
(
pre
!=
null
)
{
return
R
.
failed
(
pre
);}
// 变更日志 fxj 2023-10-24
logService
.
initModLog
(
tSalaryEmployee
,
old
,
CommonConstants
.
ZERO_STRING
,
user
.
getNickname
(),
null
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
269c6cca
...
...
@@ -632,13 +632,16 @@ 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"
);
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