Commit 118ccca0 authored by huyuchen's avatar huyuchen

huych-社保公积金自动化带出数据逻辑修改

parent c0237add
...@@ -82,6 +82,26 @@ public class TDispatchInfoPreController { ...@@ -82,6 +82,26 @@ public class TDispatchInfoPreController {
return R.ok(tDispatchInfoPreService.getNoPageList(tDispatchInfoPre)); return R.ok(tDispatchInfoPreService.getNoPageList(tDispatchInfoPre));
} }
/**
* 不分页查询
*
* @param tDispatchInfoPre 社保待购买表
* @return
*/
@Operation(summary = "不分页查询(新)", description = "不分页查询(新)")
@PostMapping("/getNoPageListNew")
public R<List<TDispatchInfoPre>> getTDispatchInfoPreNoPageNew(@RequestBody TDispatchInfoPreSearchVo tDispatchInfoPre) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfoPre);
//typeSun 0 社保 1 公积金
if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(CommonConstants.ZERO_STRING);
}else if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(tDispatchInfoPre.getTypeSub());
}
return R.ok(tDispatchInfoPreService.getNoPageListNew(tDispatchInfoPre));
}
/** /**
* 通过id查询社保待购买表 * 通过id查询社保待购买表
* *
......
...@@ -30,6 +30,8 @@ public interface TDispatchInfoPreMapper extends BaseMapper<TDispatchInfoPre> { ...@@ -30,6 +30,8 @@ public interface TDispatchInfoPreMapper extends BaseMapper<TDispatchInfoPre> {
List<TDispatchInfoPre> geNoPageList(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo tDispatchInfoPre); List<TDispatchInfoPre> geNoPageList(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo tDispatchInfoPre);
List<TDispatchInfoPre> geNoPageListNew(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo tDispatchInfoPre);
long selectExportCount(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo searchVo); long selectExportCount(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo searchVo);
List<TDispatchInfoPreExportVo> selectExportList(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo searchVo); List<TDispatchInfoPreExportVo> selectExportList(@Param("tDispatchInfoPre") TDispatchInfoPreSearchVo searchVo);
......
...@@ -36,6 +36,8 @@ public interface TDispatchInfoPreService extends IService<TDispatchInfoPre> { ...@@ -36,6 +36,8 @@ public interface TDispatchInfoPreService extends IService<TDispatchInfoPre> {
List<TDispatchInfoPre> getNoPageList(TDispatchInfoPreSearchVo searchVo); List<TDispatchInfoPre> getNoPageList(TDispatchInfoPreSearchVo searchVo);
List<TDispatchInfoPre> getNoPageListNew(TDispatchInfoPreSearchVo searchVo);
/** /**
* 社保待购买单个/批量确认 * 社保待购买单个/批量确认
* @param idList id集合 * @param idList id集合
......
...@@ -149,6 +149,16 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -149,6 +149,16 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
return baseMapper.geNoPageList(searchVo); return baseMapper.geNoPageList(searchVo);
} }
@Override
public List<TDispatchInfoPre> getNoPageListNew(TDispatchInfoPreSearchVo searchVo) {
searchVo.setType(CommonConstants.ONE_STRING);
initSearchVo(searchVo);
if (Common.isEmpty(searchVo.getStatusList())) {
searchVo.setStatusList(Stream.of("0").collect(Collectors.toList()));
}
return baseMapper.geNoPageListNew(searchVo);
}
@Override @Override
public R confirm(List<String> idList) { public R confirm(List<String> idList) {
List<TDispatchInfoPre> socialPreList = baseMapper.selectList(Wrappers.<TDispatchInfoPre>query() List<TDispatchInfoPre> socialPreList = baseMapper.selectList(Wrappers.<TDispatchInfoPre>query()
......
...@@ -589,6 +589,20 @@ ...@@ -589,6 +589,20 @@
limit 0,2000 limit 0,2000
</select> </select>
<!--tDispatchInfoPre c端不分页查询-->
<select id="geNoPageListNew" resultMap="tDispatchInfoPreMap">
SELECT
<include refid="Base_Column_List"/>
,a.FUND_START_DATE
FROM t_dispatch_info_pre a
<where>
a.DELETE_FLAG = '0'
<include refid="tDispatchInfoPre_other_where"/>
</where>
order by a.create_time desc
limit 0,2000
</select>
<!--tDispatchInfoPre社保待派单数据查询--> <!--tDispatchInfoPre社保待派单数据查询-->
<select id="getDisPatcherSocialList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchImportVo"> <select id="getDisPatcherSocialList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchImportVo">
SELECT SELECT
......
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