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
b66129c2
Commit
b66129c2
authored
Dec 01, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
bd084796
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
3 deletions
+56
-3
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+3
-1
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+51
-0
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+1
-1
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
b66129c2
...
@@ -825,7 +825,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -825,7 +825,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return
R
.
other
(
CommonConstants
.
THREE_INT
,
null
,
"该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”"
);
return
R
.
other
(
CommonConstants
.
THREE_INT
,
null
,
"该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”"
);
}
}
//判断公积金基数 是否小于 公积金户配置的最低基数
//判断公积金基数 是否小于 公积金户配置的最低基数
if
(
Common
.
isNotNull
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getConfigHouseId
())
if
(
Common
.
isNotNull
(
employeeRegistrationPre
)
&&
Common
.
isNotNull
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
())
&&
Common
.
isNotNull
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getConfigHouseId
())
&&
Common
.
isNotNull
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getProvidentCardinal
())){
&&
Common
.
isNotNull
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getProvidentCardinal
())){
R
<
SysBaseSetInfoVo
>
resR
=
socialDaprUtils
.
getSocialHouseBaseSet
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getConfigHouseId
());
R
<
SysBaseSetInfoVo
>
resR
=
socialDaprUtils
.
getSocialHouseBaseSet
(
employeeRegistrationPre
.
getDispatchInfoFundPreVo
().
getConfigHouseId
());
if
(
Common
.
isNotNull
(
resR
)
&&
resR
.
getData
()
!=
null
)
{
if
(
Common
.
isNotNull
(
resR
)
&&
resR
.
getData
()
!=
null
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
b66129c2
...
@@ -576,6 +576,57 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -576,6 +576,57 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
differenceFundKey
=
HrEquator
.
comparisonValueIgnoreField
(
dispatchInfoFundPreOldVo
differenceFundKey
=
HrEquator
.
comparisonValueIgnoreField
(
dispatchInfoFundPreOldVo
,
dispatchInfoFundPreVo
,
SOCIAL_IGNORE_FIELD
);
,
dispatchInfoFundPreVo
,
SOCIAL_IGNORE_FIELD
);
//如果自动触发派增为是,计算派单发起时间和派单确认时间
//如果自动触发派增为是,计算派单发起时间和派单确认时间
//如果自动触发派增为是,计算派单发起时间和派单确认时间
/*if (Common.isNotNull(preVo.getIsAutoDis()) && CommonConstants.ZERO_STRING.equals(preVo.getIsAutoDis())
&& Common.isNotNull(preVo.getExpectedCollectionType())) {
TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
//接收方式 0项目配置 1自定义
if (CommonConstants.ONE_STRING.equals(preVo.getReceiveType())){
vo.setMonthAfter(CommonConstants.ZERO_INT);
vo.setYearAfter(0);
vo.setRegistDate(preVo.getFundStartDate());
}else {
if (null == preVo.getFundStartDate()){
//先计算起缴日期
if (CommonConstants.ZERO_STRING.equals(preVo.getFundDateType())){
//用户选择起缴日期类型为入职日期,以入职日期为基准
vo.setMonthAfter(CommonConstants.ZERO_INT);
vo.setYearAfter(0);
vo.setRegistDate(preVo.getJoinLeaveDate());
}else if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){
//用户选择起缴日期类型为入职满一年次月,以入职日期为基准 加上年月调整
vo.setMonthAfter(CommonConstants.ONE_INT);
vo.setYearAfter(CommonConstants.ONE_INT);
vo.setRegistDate(preVo.getJoinLeaveDate());
}else if (CommonConstants.TWO_STRING.equals(preVo.getFundDateType())){
//用户自定义取值用户填写的起缴日期为基准
vo.setMonthAfter(CommonConstants.ZERO_INT);
vo.setYearAfter(0);
vo.setRegistDate(preVo.getFundStartDate());
}
}else {
vo.setMonthAfter(CommonConstants.ZERO_INT);
vo.setYearAfter(0);
vo.setRegistDate(preVo.getFundStartDate());
}
}
Date date = this.addYearsMonths(vo);
if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){
date = DateUtil.getFirstDay(date);
}
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date);
dayVo.setRegistType(0);
TEmployeeInsuranceWorkDayVo dataR = tHolidayInfoService.selectBeforeOrAfterWorkDayCommon(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getRegistDate())) {
preVo.setExpectedCollectionTime(dataR.getRegistDate());
preVo.setExpectedConfirmTime(dataR.getRegistDate());
} else {
preVo.setExpectedCollectionTime(date);
preVo.setExpectedConfirmTime(date);
}*/
if
(
differenceFundKey
.
length
()
>
0
)
{
if
(
differenceFundKey
.
length
()
>
0
)
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、公积金信息"
;
diffTitle
+=
"、公积金信息"
;
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
b66129c2
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
1=1
1=1
<include
refid=
"employeeRegistration_where"
/>
<include
refid=
"employeeRegistration_where"
/>
</where>
</where>
limit 0,
5
limit 0,
2000
</select>
</select>
<!--employeeRegistration简单分页查询-->
<!--employeeRegistration简单分页查询-->
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
b66129c2
...
@@ -490,7 +490,7 @@
...
@@ -490,7 +490,7 @@
<include
refid=
"tDispatchInfoPre_other_where"
/>
<include
refid=
"tDispatchInfoPre_other_where"
/>
</where>
</where>
order by a.create_time desc
order by a.create_time desc
limit 0,
5
limit 0,
2000
</select>
</select>
<!--tDispatchInfoPre社保待派单数据查询-->
<!--tDispatchInfoPre社保待派单数据查询-->
...
...
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