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
e4dc3fea
Commit
e4dc3fea
authored
Jan 29, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19
parents
9d9bd234
0e31ce38
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
4 deletions
+21
-4
TDispatchInfoPreMapper.java
...ud/plus/v1/yifu/social/mapper/TDispatchInfoPreMapper.java
+2
-0
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+1
-1
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+18
-3
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoPreMapper.java
View file @
e4dc3fea
...
@@ -54,4 +54,6 @@ public interface TDispatchInfoPreMapper extends BaseMapper<TDispatchInfoPre> {
...
@@ -54,4 +54,6 @@ public interface TDispatchInfoPreMapper extends BaseMapper<TDispatchInfoPre> {
long
selectFundCount
(
@Param
(
"tDispatchInfoPre"
)
TDispatchInfoPreSearchVo
searchVo
);
long
selectFundCount
(
@Param
(
"tDispatchInfoPre"
)
TDispatchInfoPreSearchVo
searchVo
);
long
selectSocialCount
(
@Param
(
"tDispatchInfoPre"
)
TDispatchInfoPreSearchVo
searchVo
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
e4dc3fea
...
@@ -194,7 +194,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -194,7 +194,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
@Override
@Override
public
long
getDispatchInfoCount
(
TDispatchInfoPreSearchVo
searchVo
)
{
public
long
getDispatchInfoCount
(
TDispatchInfoPreSearchVo
searchVo
)
{
initSearchVo
(
searchVo
);
initSearchVo
(
searchVo
);
return
baseMapper
.
select
Export
Count
(
searchVo
);
return
baseMapper
.
select
Social
Count
(
searchVo
);
}
}
@Override
@Override
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
e4dc3fea
...
@@ -467,19 +467,22 @@
...
@@ -467,19 +467,22 @@
</select>
</select>
<select
id=
"selectExportCount"
resultType=
"java.lang.Long"
>
<select
id=
"selectExportCount"
resultType=
"java.lang.Long"
>
select count(a.id) from (
SELECT
SELECT
count(a.id)
a.id
FROM t_dispatch_info_pre a
FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
<where>
<where>
1=1 and a.type_sub = '0'
1=1 and a.type_sub = '0'
<include
refid=
"tDispatchInfoPre_where"
/>
<include
refid=
"tDispatchInfoPre_where"
/>
</where>
</where>
group by a.id
) a
</select>
</select>
<select
id=
"selectFundExportCount"
resultType=
"java.lang.Long"
>
<select
id=
"selectFundExportCount"
resultType=
"java.lang.Long"
>
select count(a.id) from (
SELECT
SELECT
count(a.id)
a.id
FROM t_dispatch_info_pre a
FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
<where>
<where>
...
@@ -487,6 +490,18 @@
...
@@ -487,6 +490,18 @@
and a.DELETE_FLAG = '0'
and a.DELETE_FLAG = '0'
<include
refid=
"tDispatchInfoPre_where"
/>
<include
refid=
"tDispatchInfoPre_where"
/>
</where>
</where>
group by a.id) a
</select>
<select
id=
"selectSocialCount"
resultType=
"java.lang.Long"
>
SELECT
count(a.id)
FROM t_dispatch_info_pre a
<where>
1=1 and a.type_sub = '0' and a.DELETE_FLAG = '0'
<include
refid=
"tDispatchInfoPre_where"
/>
</where>
</select>
</select>
<select
id=
"selectFundCount"
resultType=
"java.lang.Long"
>
<select
id=
"selectFundCount"
resultType=
"java.lang.Long"
>
...
...
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