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
95b7e738
Commit
95b7e738
authored
Dec 01, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
4e4be662
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
THolidayInfoServiceImpl.java
.../v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
+4
-5
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
View file @
95b7e738
...
@@ -316,7 +316,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
...
@@ -316,7 +316,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
@Override
@Override
public
TEmployeeInsuranceWorkDayVo
selectBeforeOrAfterWorkDay
(
TEmployeeInsuranceWorkDayVo
vo
)
{
public
TEmployeeInsuranceWorkDayVo
selectBeforeOrAfterWorkDay
(
TEmployeeInsuranceWorkDayVo
vo
)
{
//获取当年所有假期配置表
//获取当年所有假期配置表
Date
date
=
new
Date
();
//
Date date = new Date();
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
());
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
());
Map
<
Date
,
String
>
holidayMap
=
new
HashMap
<>();
Map
<
Date
,
String
>
holidayMap
=
new
HashMap
<>();
if
(
Common
.
isNotNull
(
holidayInfos
)){
if
(
Common
.
isNotNull
(
holidayInfos
)){
...
@@ -331,7 +331,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
...
@@ -331,7 +331,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
@Override
@Override
public
TEmployeeInsuranceWorkDayVo
selectBeforeOrAfterWorkDayCommon
(
TEmployeeInsuranceWorkDayVo
vo
)
{
public
TEmployeeInsuranceWorkDayVo
selectBeforeOrAfterWorkDayCommon
(
TEmployeeInsuranceWorkDayVo
vo
)
{
//获取当年所有假期配置表
//获取当年所有假期配置表
Date
date
=
new
Date
();
//
Date date = new Date();
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
());
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
());
Map
<
Date
,
String
>
holidayMap
=
new
HashMap
<>();
Map
<
Date
,
String
>
holidayMap
=
new
HashMap
<>();
if
(
Common
.
isNotNull
(
holidayInfos
)){
if
(
Common
.
isNotNull
(
holidayInfos
)){
...
@@ -393,9 +393,8 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
...
@@ -393,9 +393,8 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
@Override
@Override
public
TEmployeeInsuranceWorkDayVo
getInitBeforeOrAfterWorkDay
(
TEmployeeInsuranceWorkDayVo
vo
)
{
public
TEmployeeInsuranceWorkDayVo
getInitBeforeOrAfterWorkDay
(
TEmployeeInsuranceWorkDayVo
vo
)
{
//获取当年所有假期配置表
//获取当年所有假期配置表
Date
date
=
new
Date
();
//Date date = new Date();
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
()
List
<
THolidayInfo
>
holidayInfos
=
baseMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
());
.
eq
(
THolidayInfo:
:
getYear
,
DateUtil
.
getYear
(
date
)));
Map
<
Date
,
String
>
holidayMap
=
new
HashMap
<>();
Map
<
Date
,
String
>
holidayMap
=
new
HashMap
<>();
if
(
Common
.
isNotNull
(
holidayInfos
)){
if
(
Common
.
isNotNull
(
holidayInfos
)){
for
(
THolidayInfo
h:
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