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
85a1aa04
Commit
85a1aa04
authored
Dec 01, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
7afc6e87
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+1
-1
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+1
-1
THolidayInfoServiceImpl.java
.../v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
+1
-2
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
85a1aa04
...
...
@@ -1463,7 +1463,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
null
!=
preVo
.
getExitFundInfoList
()
&&
!
preVo
.
getExitFundInfoList
().
isEmpty
())
{
preVo
.
getExitFundInfoList
().
forEach
(
fundPreDetailVo
->
fundPreDetailVo
.
setRegisterId
(
domainR
.
getData
()));
}
//生成
社保
待购买或者已购买数据
//生成
公积金
待购买或者已购买数据
if
(
null
!=
preVo
.
getDispatchInfoFundPreVo
())
{
initFundPreInfo
(
registrationNow
,
preVo
.
getDispatchInfoFundPreVo
(),
user
,
domainR
.
getData
());
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
85a1aa04
...
...
@@ -306,7 +306,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
public
Boolean
saveFundPreInfo
(
EmployeeRegistrationPreVo
registrationPreVo
)
{
if
(
Common
.
isNotNull
(
registrationPreVo
.
getFundIsBuy
())
&&
registrationPreVo
.
getFundIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
registrationPreVo
.
getExit
Social
InfoList
().
isEmpty
())
{
&&
!
registrationPreVo
.
getExit
Fund
InfoList
().
isEmpty
())
{
//删除已存在的入职确认信息对应的公积金明细
fundPreDetailService
.
remove
(
Wrappers
.<
TFundPreDetail
>
lambdaQuery
()
.
eq
(
TFundPreDetail:
:
getRegisterId
,
registrationPreVo
.
getExitFundInfoList
()
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
View file @
85a1aa04
...
...
@@ -333,8 +333,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
public
TEmployeeInsuranceWorkDayVo
selectBeforeOrAfterWorkDayCommon
(
TEmployeeInsuranceWorkDayVo
vo
)
{
//获取当年所有假期配置表
Date
date
=
new
Date
();
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
()
.
eq
(
THolidayInfo:
:
getYear
,
DateUtil
.
getYear
(
date
)));
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
());
Map
<
Date
,
String
>
holidayMap
=
new
HashMap
<>();
if
(
Common
.
isNotNull
(
holidayInfos
)){
for
(
THolidayInfo
h:
holidayInfos
){
...
...
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