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
952cf2e3
Commit
952cf2e3
authored
Aug 06, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.14-薪资人员导入校验优化
parent
066b1c04
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
TSalaryEmployeeService.java
...d/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
+3
-2
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+4
-6
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+7
-2
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
View file @
952cf2e3
...
@@ -71,7 +71,7 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
...
@@ -71,7 +71,7 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
* @Date: 2023/2/9 14:57
* @Date: 2023/2/9 14:57
* @return: java.lang.String
* @return: java.lang.String
**/
**/
String
saveNewEmployeeList
(
List
<
TSalaryEmployee
>
saveNewEmpList
,
List
<
ErrorMessage
>
errorList
);
String
saveNewEmployeeList
(
List
<
TSalaryEmployee
>
saveNewEmpList
,
List
<
ErrorMessage
>
errorList
,
Map
<
String
,
Integer
>
phoneExcelMap
);
/**
/**
* @Description: 更新卡号等信息
* @Description: 更新卡号等信息
...
@@ -79,7 +79,8 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
...
@@ -79,7 +79,8 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
* @Date: 2024/7/22 10:27
* @Date: 2024/7/22 10:27
* @return: java.lang.String
* @return: java.lang.String
**/
**/
String
updateEmployeeBankList
(
List
<
TSalaryEmployee
>
updateEmpBankList
,
Map
<
String
,
TSalaryEmployee
>
updateEmpBankMap
,
List
<
ErrorMessage
>
errorList
);
String
updateEmployeeBankList
(
List
<
TSalaryEmployee
>
updateEmpBankList
,
Map
<
String
,
TSalaryEmployee
>
updateEmpBankMap
,
List
<
ErrorMessage
>
errorList
,
Map
<
String
,
Integer
>
phoneExcelMap
);
/**
/**
* @param inputStream
* @param inputStream
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
952cf2e3
...
@@ -314,14 +314,13 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -314,14 +314,13 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
@Override
@Override
public
String
saveNewEmployeeList
(
List
<
TSalaryEmployee
>
saveNewEmpList
,
List
<
ErrorMessage
>
errorList
)
{
public
String
saveNewEmployeeList
(
List
<
TSalaryEmployee
>
saveNewEmpList
,
List
<
ErrorMessage
>
errorList
,
Map
<
String
,
Integer
>
phoneExcelMap
)
{
if
(
saveNewEmpList
!=
null
&&
!
saveNewEmpList
.
isEmpty
())
{
if
(
saveNewEmpList
!=
null
&&
!
saveNewEmpList
.
isEmpty
())
{
// 银行卡
// 银行卡
List
<
TCheckBankNo
>
bankList
=
new
ArrayList
<>();
List
<
TCheckBankNo
>
bankList
=
new
ArrayList
<>();
List
<
String
>
phoneList
=
new
ArrayList
<>();
List
<
String
>
phoneList
=
new
ArrayList
<>();
TCheckBankNo
checkBankNo
;
TCheckBankNo
checkBankNo
;
// 查本表重
Map
<
String
,
Integer
>
phoneExcelMap
=
new
HashMap
<>();
// 本表重复的手机号,不允许导入该行
// 本表重复的手机号,不允许导入该行
Map
<
String
,
Integer
>
phoneRepeatMap
=
new
HashMap
<>();
Map
<
String
,
Integer
>
phoneRepeatMap
=
new
HashMap
<>();
Integer
phoneCount
;
Integer
phoneCount
;
...
@@ -446,15 +445,14 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -446,15 +445,14 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
@Override
@Override
public
String
updateEmployeeBankList
(
List
<
TSalaryEmployee
>
updateEmployeeBankList
public
String
updateEmployeeBankList
(
List
<
TSalaryEmployee
>
updateEmployeeBankList
,
Map
<
String
,
TSalaryEmployee
>
updateEmpBankMap
,
List
<
ErrorMessage
>
errorList
)
{
,
Map
<
String
,
TSalaryEmployee
>
updateEmpBankMap
,
List
<
ErrorMessage
>
errorList
,
Map
<
String
,
Integer
>
phoneExcelMap
)
{
if
(
updateEmployeeBankList
!=
null
&&
!
updateEmployeeBankList
.
isEmpty
())
{
if
(
updateEmployeeBankList
!=
null
&&
!
updateEmployeeBankList
.
isEmpty
())
{
// 银行卡
// 银行卡
List
<
TCheckBankNo
>
bankList
=
new
ArrayList
<>();
List
<
TCheckBankNo
>
bankList
=
new
ArrayList
<>();
TCheckBankNo
checkBankNo
;
TCheckBankNo
checkBankNo
;
List
<
String
>
phoneList
=
new
ArrayList
<>();
List
<
String
>
phoneList
=
new
ArrayList
<>();
// 查本表重
Map
<
String
,
Integer
>
phoneExcelMap
=
new
HashMap
<>();
// 本表重复的手机号,不允许导入该行
// 本表重复的手机号,不允许导入该行
Map
<
String
,
Integer
>
phoneRepeatMap
=
new
HashMap
<>();
Map
<
String
,
Integer
>
phoneRepeatMap
=
new
HashMap
<>();
Integer
phoneCount
;
Integer
phoneCount
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
952cf2e3
...
@@ -633,13 +633,18 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -633,13 +633,18 @@ public class SalaryAccountUtil implements Serializable {
}
}
}
}
if
(
canSave
)
{
if
(
canSave
)
{
// 查本表重
Map
<
String
,
Integer
>
phoneExcelMap
=
new
HashMap
<>();
// 新增
// 新增
if
(!
saveNewEmpList
.
isEmpty
())
{
if
(!
saveNewEmpList
.
isEmpty
())
{
tSalaryEmployeeService
.
saveNewEmployeeList
(
saveNewEmpList
,
errorList
);
tSalaryEmployeeService
.
saveNewEmployeeList
(
saveNewEmpList
,
errorList
,
phoneExcelMap
);
}
}
// 更新人员信息
// 更新人员信息
if
(!
updateEmpBankList
.
isEmpty
())
{
if
(!
updateEmpBankList
.
isEmpty
())
{
tSalaryEmployeeService
.
updateEmployeeBankList
(
updateEmpBankList
,
updateEmpBankMap
,
errorList
);
tSalaryEmployeeService
.
updateEmployeeBankList
(
updateEmpBankList
,
updateEmpBankMap
,
errorList
,
phoneExcelMap
);
}
if
(
phoneExcelMap
!=
null
&&
!
phoneExcelMap
.
isEmpty
())
{
phoneExcelMap
.
clear
();
}
}
}
}
}
}
...
...
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