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
ccc1ce03
Commit
ccc1ce03
authored
Oct 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
630736f9
df5dd480
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+4
-0
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+1
-1
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
ccc1ce03
...
@@ -46,6 +46,7 @@ import java.time.LocalDate;
...
@@ -46,6 +46,7 @@ import java.time.LocalDate;
import
java.time.ZoneId
;
import
java.time.ZoneId
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
/**
* 社保待购买表
* 社保待购买表
...
@@ -136,6 +137,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -136,6 +137,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
public
List
<
TDispatchInfoPre
>
getNoPageList
(
TDispatchInfoPreSearchVo
searchVo
)
{
public
List
<
TDispatchInfoPre
>
getNoPageList
(
TDispatchInfoPreSearchVo
searchVo
)
{
searchVo
.
setType
(
CommonConstants
.
ONE_STRING
);
searchVo
.
setType
(
CommonConstants
.
ONE_STRING
);
initSearchVo
(
searchVo
);
initSearchVo
(
searchVo
);
if
(
Common
.
isEmpty
(
searchVo
.
getStatusList
()))
{
searchVo
.
setStatusList
(
Stream
.
of
(
"0"
).
collect
(
Collectors
.
toList
()));
}
return
baseMapper
.
geNoPageList
(
searchVo
);
return
baseMapper
.
geNoPageList
(
searchVo
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
ccc1ce03
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
<if
test=
"tDispatchInfoPre.statusList != null and tDispatchInfoPre.statusList.size() > 0"
>
<if
test=
"tDispatchInfoPre.statusList != null and tDispatchInfoPre.statusList.size() > 0"
>
AND a.process_status in
AND a.process_status in
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfoPre.statusList"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfoPre.statusList"
open=
"("
separator=
","
close=
")"
>
#{item}
'${item}'
</foreach>
</foreach>
</if>
</if>
<if
test=
"tDispatchInfoPre.empName != null and tDispatchInfoPre.empName.trim() != ''"
>
<if
test=
"tDispatchInfoPre.empName != null and tDispatchInfoPre.empName.trim() != ''"
>
...
...
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