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
ec8572c8
Commit
ec8572c8
authored
Dec 03, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
1e8daa96
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
12 deletions
+15
-12
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+15
-12
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
ec8572c8
...
...
@@ -810,22 +810,25 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//1.9.17公积金自动化校验逻辑
if
(
employeeRegistrationPre
.
getServerItem
().
contains
(
"公积金"
))
{
//根据身份证号码和项目编号查询公积金
/*
TEmployeeAutoRegistCheckVo cardVo = new TEmployeeAutoRegistCheckVo();
TEmployeeAutoRegistCheckVo
cardVo
=
new
TEmployeeAutoRegistCheckVo
();
cardVo
.
setEmpIdcard
(
employeeRegistrationPre
.
getEmpIdcard
());
R
<
Boolean
>
fundFlag
=
socialDaprUtils
.
selectExitEmpFund
(
cardVo
);
//是否已购买为是需要判断公积金是否在用或者流程中
if (CommonConstants.ZERO_STRING.equals(employeeRegistrationPre.getFundIsBuy()) &&
(Common.isEmpty(fundFlag) || Boolean.TRUE.equals(!fundFlag.getData()))) {
return R.other(CommonConstants.TWO_INT, null, "未找到流程中或者在用的公积金信息!");
}
//是否已购买为否需要判断是否在用或者流程中的公积金
if (CommonConstants.ONE_STRING.equals(employeeRegistrationPre.getFundIsBuy()) &&
Common.isNotNull(fundFlag) && Boolean.TRUE.equals(fundFlag.getData()) &&
null != employeeRegistrationPre.getDispatchInfoFundPreVo()) {
return R.other(CommonConstants.TWO_INT, null, "该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”");
if
(
null
!=
employeeRegistrationPre
.
getFundUpdateFlag
()
&&
employeeRegistrationPre
.
getFundUpdateFlag
().
booleanValue
()){
//是否已购买为是需要判断公积金是否在用或者流程中
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
employeeRegistrationPre
.
getFundIsBuy
())
&&
(
Common
.
isEmpty
(
fundFlag
)
||
Boolean
.
TRUE
.
equals
(!
fundFlag
.
getData
())))
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"未找到流程中或者在用的公积金信息!"
);
}
//是否已购买为否需要判断是否在用或者流程中的公积金
if
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeRegistrationPre
.
getFundIsBuy
())
&&
Common
.
isNotNull
(
fundFlag
)
&&
Boolean
.
TRUE
.
equals
(
fundFlag
.
getData
())
&&
null
!=
employeeRegistrationPre
.
getDispatchInfoFundPreVo
())
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”"
);
}
}
//判断公积金基数 是否小于 公积金户配置的最低基数
if (Common.isNotNull(employeeRegistrationPre)
/*
if (Common.isNotNull(employeeRegistrationPre)
&& Common.isNotNull(employeeRegistrationPre.getDispatchInfoFundPreVo())
&& Common.isNotNull(employeeRegistrationPre.getDispatchInfoFundPreVo().getConfigHouseId())
&& Common.isNotNull(employeeRegistrationPre.getDispatchInfoFundPreVo().getProvidentCardinal())){
...
...
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