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
986f62e9
Commit
986f62e9
authored
Sep 18, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.15-1.7.15去除姓名找人
parent
4308b36e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+7
-6
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+7
-5
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
986f62e9
...
@@ -216,8 +216,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -216,8 +216,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
List
<
TSalaryEmployee
>
empList
=
employeeService
.
list
(
Wrappers
.<
TSalaryEmployee
>
query
().
lambda
()
List
<
TSalaryEmployee
>
empList
=
employeeService
.
list
(
Wrappers
.<
TSalaryEmployee
>
query
().
lambda
()
.
eq
(
TSalaryEmployee:
:
getUnitId
,
dept
.
getCustomerId
()));
.
eq
(
TSalaryEmployee:
:
getUnitId
,
dept
.
getCustomerId
()));
Map
<
String
,
TSalaryEmployee
>
empIdCardMap
=
new
HashMap
<>();
Map
<
String
,
TSalaryEmployee
>
empIdCardMap
=
new
HashMap
<>();
Map
<
String
,
TSalaryEmployee
>
empNameMap
=
new
HashMap
<>();
// 2025-9-12 10:06:42 倩倩说不能根据姓名找人
boolean
isDuplicateName
=
false
;
// Map<String, TSalaryEmployee> empNameMap = new HashMap<>()
// boolean isDuplicateName = false;
if
(
empList
!=
null
)
{
if
(
empList
!=
null
)
{
TSalaryEmployee
es
;
TSalaryEmployee
es
;
// 筛选人员,添加判断:非在职,或开户行为空,或 结算主体等于选择的结算主体且在职,都可以存入Map优先备用
// 筛选人员,添加判断:非在职,或开户行为空,或 结算主体等于选择的结算主体且在职,都可以存入Map优先备用
...
@@ -226,12 +227,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -226,12 +227,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
es
=
empIdCardMap
.
get
(
e
.
getEmpIdcard
());
es
=
empIdCardMap
.
get
(
e
.
getEmpIdcard
());
if
(
es
==
null
||
(
e
.
getDeptId
().
equals
(
settleDepart
)
&&
Common
.
isNotNull
(
e
.
getBankProvince
())))
{
if
(
es
==
null
||
(
e
.
getDeptId
().
equals
(
settleDepart
)
&&
Common
.
isNotNull
(
e
.
getBankProvince
())))
{
empIdCardMap
.
put
(
e
.
getEmpIdcard
(),
e
);
empIdCardMap
.
put
(
e
.
getEmpIdcard
(),
e
);
empNameMap
.
put
(
e
.
getEmpName
().
replace
(
" "
,
""
),
e
);
//
empNameMap.put(e.getEmpName().replace(" ", ""), e);
}
}
}
}
if
(
empNameMap
.
size
()
==
empIdCardMap
.
size
())
{
/*
if (empNameMap.size() == empIdCardMap.size()) {
isDuplicateName = true;
isDuplicateName = true;
}
}
*/
}
}
// 自有员工结算主体id,新员工使用
// 自有员工结算主体id,新员工使用
Map
<
String
,
Integer
>
ownDeptMap
=
tOwnDeptService
.
getOwnDeptMap
();
Map
<
String
,
Integer
>
ownDeptMap
=
tOwnDeptService
.
getOwnDeptMap
();
...
@@ -269,7 +270,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -269,7 +270,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
Map
<
String
,
String
>
bankMap
=
tBankSetService
.
getBankMap
(
null
);
Map
<
String
,
String
>
bankMap
=
tBankSetService
.
getBankMap
(
null
);
util1
.
getJsonStringToList
(
user
,
vo
,
dept
,
configSalary
,
salaryConfigMap
,
isMustMap
,
util1
.
getJsonStringToList
(
user
,
vo
,
dept
,
configSalary
,
salaryConfigMap
,
isMustMap
,
empIdCardMap
,
empNameMap
,
isDuplicateName
,
checkListY
,
invoiceTitle
,
empIdCardMap
,
checkListY
,
invoiceTitle
,
employeeService
,
checkMap
,
specialMap
,
ownEmployeeMap
,
ownDeptMap
,
tSalaryAccountService
,
bankMap
);
employeeService
,
checkMap
,
specialMap
,
ownEmployeeMap
,
ownDeptMap
,
tSalaryAccountService
,
bankMap
);
List
<
TSalaryAccountVo
>
saList
=
util1
.
getEntityList
();
List
<
TSalaryAccountVo
>
saList
=
util1
.
getEntityList
();
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
986f62e9
...
@@ -60,8 +60,8 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -60,8 +60,8 @@ public class SalaryAccountUtil implements Serializable {
* @param configSalary 当前项目下的配置(结算月等
* @param configSalary 当前项目下的配置(结算月等
* @param salaryConfigMap 客户原表-工资模板配置Map
* @param salaryConfigMap 客户原表-工资模板配置Map
* @param empIdCardMap 当前项目下的员工Map
* @param empIdCardMap 当前项目下的员工Map
*
@param empNameMap 当前项目下的员工Map
*
empNameMap 当前项目下的员工Map 2025-9-12 10:06:42 倩倩说不能根据姓名找人
*
@param
isDuplicateName false:有重名(当前项目下的员工),则不可用姓名查找,必须含有身份证号列
* isDuplicateName false:有重名(当前项目下的员工),则不可用姓名查找,必须含有身份证号列
* repeatFlag 默认 0:不允许重复导入已存在系统内的数据;1:允许重复导入
* repeatFlag 默认 0:不允许重复导入已存在系统内的数据;1:允许重复导入
* @param ownEmployeeMap 自有员工所在项目Map
* @param ownEmployeeMap 自有员工所在项目Map
* @Description: 将jsonStr数据源的数据导入到 List<TSalaryAccount>
* @Description: 将jsonStr数据源的数据导入到 List<TSalaryAccount>
...
@@ -71,7 +71,7 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -71,7 +71,7 @@ public class SalaryAccountUtil implements Serializable {
**/
**/
public
void
getJsonStringToList
(
YifuUser
user
,
SalaryUploadParamVo
vo
,
TSettleDomainSelectVo
dept
public
void
getJsonStringToList
(
YifuUser
user
,
SalaryUploadParamVo
vo
,
TSettleDomainSelectVo
dept
,
TConfigSalary
configSalary
,
Map
<
String
,
TSalaryConfigStandard
>
salaryConfigMap
,
Map
<
String
,
Boolean
>
isMustMap
,
TConfigSalary
configSalary
,
Map
<
String
,
TSalaryConfigStandard
>
salaryConfigMap
,
Map
<
String
,
Boolean
>
isMustMap
,
Map
<
String
,
TSalaryEmployee
>
empIdCardMap
,
Map
<
String
,
TSalaryEmployee
>
empNameMap
,
boolean
isDuplicateName
,
Map
<
String
,
TSalaryEmployee
>
empIdCardMap
,
List
<
String
>
checkListY
,
String
invoiceTitle
,
TSalaryEmployeeService
tSalaryEmployeeService
,
List
<
String
>
checkListY
,
String
invoiceTitle
,
TSalaryEmployeeService
tSalaryEmployeeService
,
Map
<
String
,
Integer
>
checkMap
,
Map
<
String
,
BigDecimal
>
specialMap
,
Map
<
String
,
Integer
>
ownEmployeeMap
,
Map
<
String
,
Integer
>
checkMap
,
Map
<
String
,
BigDecimal
>
specialMap
,
Map
<
String
,
Integer
>
ownEmployeeMap
,
Map
<
String
,
Integer
>
ownDeptMap
,
TSalaryAccountService
tSalaryAccountService
,
Map
<
String
,
String
>
bankMap
)
{
,
Map
<
String
,
Integer
>
ownDeptMap
,
TSalaryAccountService
tSalaryAccountService
,
Map
<
String
,
String
>
bankMap
)
{
...
@@ -274,9 +274,9 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -274,9 +274,9 @@ public class SalaryAccountUtil implements Serializable {
}
}
if
(
SalaryConstants
.
EMP_NAME
.
equals
(
dbFiedName
))
{
if
(
SalaryConstants
.
EMP_NAME
.
equals
(
dbFiedName
))
{
empName
=
cellValueStr
=
cellValueStr
.
replace
(
" "
,
""
);
empName
=
cellValueStr
=
cellValueStr
.
replace
(
" "
,
""
);
if
(
isDuplicateName
)
{
/*
if (isDuplicateName) {
emp = empNameMap.get(empName);
emp = empNameMap.get(empName);
}
}
*/
newEmp
.
setEmpName
(
empName
);
newEmp
.
setEmpName
(
empName
);
}
}
...
@@ -286,6 +286,8 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -286,6 +286,8 @@ public class SalaryAccountUtil implements Serializable {
entity
.
setIsNewEmployee
(
CommonConstants
.
ONE_STRING
);
entity
.
setIsNewEmployee
(
CommonConstants
.
ONE_STRING
);
}
}
if
(
SalaryConstants
.
ID_NUMBER
.
equals
(
dbFiedName
))
{
if
(
SalaryConstants
.
ID_NUMBER
.
equals
(
dbFiedName
))
{
// 有身份证,按身份证查找人
emp
=
null
;
if
(
checkIdNumberMap
.
get
(
cellValueStr
)
==
null
)
{
if
(
checkIdNumberMap
.
get
(
cellValueStr
)
==
null
)
{
checkIdNumberMap
.
put
(
cellValueStr
,
(
i
+
dataRow
));
checkIdNumberMap
.
put
(
cellValueStr
,
(
i
+
dataRow
));
}
else
{
}
else
{
...
...
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