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
daf15711
Commit
daf15711
authored
Dec 02, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
3bd457c7
3cfe105e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+4
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
daf15711
...
...
@@ -816,13 +816,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//是否已购买为是需要判断公积金是否在用或者流程中
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
employeeRegistrationPre
.
getFundIsBuy
())
&&
(
Common
.
isEmpty
(
fundFlag
)
||
Boolean
.
TRUE
.
equals
(!
fundFlag
.
getData
())))
{
return
R
.
other
(
CommonConstants
.
T
HREE
_INT
,
null
,
"未找到流程中或者在用的公积金信息!"
);
return
R
.
other
(
CommonConstants
.
T
WO
_INT
,
null
,
"未找到流程中或者在用的公积金信息!"
);
}
//是否已购买为否需要判断是否在用或者流程中的公积金
if
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeRegistrationPre
.
getFundIsBuy
())
&&
Common
.
isNotNull
(
fundFlag
)
&&
Boolean
.
TRUE
.
equals
(
fundFlag
.
getData
())
&&
null
!=
employeeRegistrationPre
.
getDispatchInfoFundPreVo
())
{
return
R
.
other
(
CommonConstants
.
T
HREE
_INT
,
null
,
"该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”"
);
return
R
.
other
(
CommonConstants
.
T
WO
_INT
,
null
,
"该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”"
);
}
//判断公积金基数 是否小于 公积金户配置的最低基数
if
(
Common
.
isNotNull
(
employeeRegistrationPre
)
...
...
@@ -833,11 +833,11 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if
(
Common
.
isNotNull
(
resR
)
&&
resR
.
getData
()
!=
null
)
{
SysBaseSetInfoVo
setInfo
=
resR
.
getData
();
if
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getProvidentCardinal
().
compareTo
(
setInfo
.
getLowerLimit
())
<
0
)
{
return
R
.
other
(
CommonConstants
.
T
HREE
_INT
,
null
,
"公积金基数需≥当前户("
+
setInfo
.
getDepartName
()+
")的最低基数:"
+
setInfo
.
getLowerLimit
()+
"!"
);
return
R
.
other
(
CommonConstants
.
T
WO
_INT
,
null
,
"公积金基数需≥当前户("
+
setInfo
.
getDepartName
()+
")的最低基数:"
+
setInfo
.
getLowerLimit
()+
"!"
);
}
}
else
{
return
R
.
other
(
CommonConstants
.
T
HREE
_INT
,
null
,
"获取公积金配置信息失败!"
);
return
R
.
other
(
CommonConstants
.
T
WO
_INT
,
null
,
"获取公积金配置信息失败!"
);
}
}
//(公积金待办为在途在保)流程中的公积金数据不能修改
...
...
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