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
502eeea8
Commit
502eeea8
authored
Dec 02, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
5d603dd4
9174f336
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
8 deletions
+16
-8
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+6
-6
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+3
-2
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+3
-0
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+2
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
502eeea8
...
...
@@ -810,19 +810,19 @@ 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
.
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,13 +833,13 @@ 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,"获取公积金配置信息失败!");
}
}
}
*/
//(公积金待办为在途在保)流程中的公积金数据不能修改
//查已购买公积金明细
if
(
null
!=
employeeRegistrationPre
.
getDispatchInfoFundPreVo
()
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
502eeea8
...
...
@@ -645,8 +645,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
initFundPreInfo
(
preVo
,
preVo
.
getDispatchInfoFundPreVo
(),
user
,
empPreId
);
}
//如果页面传承为不修改则不更新数据
if
(
null
!=
preVo
&&
null
!=
preVo
.
getFundUpdateFlag
()
&&
preVo
.
getFundUpdateFlag
().
booleanValue
()){
if
(
null
!=
preVo
&&
(
null
==
preVo
.
getFundUpdateFlag
()
||
(
null
!=
preVo
.
getFundUpdateFlag
()
&&
preVo
.
getFundUpdateFlag
().
booleanValue
()))){
socialDaprUtils
.
saveFundPreInfo
(
preVo
);
}
}
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
502eeea8
...
...
@@ -721,6 +721,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
returnVo
=
returnR
.
getData
();
if
(
Common
.
isNotNull
(
returnVo
.
getResultIdThree
()))
{
contractId
=
returnVo
.
getResultIdThree
();
}
if
(
Common
.
isNotNull
(
returnVo
.
getResultIdFourStatus
()))
{
contractIdEnd
=
returnVo
.
getResultIdFourStatus
();
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
502eeea8
...
...
@@ -4753,6 +4753,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
handleRemark
,
user
);
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
NINE_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
502eeea8
...
...
@@ -1321,6 +1321,7 @@
where a.EMP_IDCARD = #{empIdCard}
and a.SETTLE_DOMAIN_CODE = #{deptNo}
and a.SOCIAL_STATUS = '8'
and d.type = '1'
limit 1
</select>
...
...
@@ -1331,6 +1332,7 @@
where a.EMP_IDCARD = #{empIdCard}
and a.SETTLE_DOMAIN_CODE_FUND = #{deptNo}
and a.FUND_STATUS = '7'
and d.type = '1'
limit 1
</select>
...
...
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