Commit e4dc3fea authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19

parents 9d9bd234 0e31ce38
......@@ -54,4 +54,6 @@ public interface TDispatchInfoPreMapper extends BaseMapper<TDispatchInfoPre> {
long selectFundCount(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo searchVo);
long selectSocialCount(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo searchVo);
}
......@@ -194,7 +194,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
@Override
public long getDispatchInfoCount(TDispatchInfoPreSearchVo searchVo) {
initSearchVo(searchVo);
return baseMapper.selectExportCount(searchVo);
return baseMapper.selectSocialCount(searchVo);
}
@Override
......
......@@ -467,19 +467,22 @@
</select>
<select id="selectExportCount" resultType="java.lang.Long">
select count(a.id) from (
SELECT
count(a.id)
a.id
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
<where>
1=1 and a.type_sub = '0'
<include refid="tDispatchInfoPre_where"/>
</where>
group by a.id
) a
</select>
<select id="selectFundExportCount" resultType="java.lang.Long">
select count(a.id) from (
SELECT
count(a.id)
a.id
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
<where>
......@@ -487,6 +490,18 @@
and a.DELETE_FLAG = '0'
<include refid="tDispatchInfoPre_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 id="selectFundCount" resultType="java.lang.Long">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment