Commit 6c590873 authored by fangxinjiang's avatar fangxinjiang

代码优化-公积金户获取优化-fxj

parent 94fc89ec
...@@ -2132,7 +2132,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2132,7 +2132,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialBases.clear(); socialBases.clear();
} }
if (Common.isNotNull(fundHolds)) { if (Common.isNotNull(fundHolds)) {
List<SysBaseSetInfo> fundBases = baseSetMapper.getFundBaseSet(fundHolds); List<SysBaseSetInfo> fundBases = baseSetMapper.selectList(Wrappers.<SysBaseSetInfo>query().lambda()
.eq(SysBaseSetInfo::getBaseType, CommonConstants.ONE_STRING)
.le(SysBaseSetInfo::getApplyStartDate, now)
.in(SysBaseSetInfo::getDepartName, fundHolds)
.eq(SysBaseSetInfo::getStatus, CommonConstants.ZERO_STRING)
.eq(SysBaseSetInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
.and(obj -> obj.isNull(SysBaseSetInfo::getApplyEndDate).or().ge(SysBaseSetInfo::getApplyEndDate, now))
.groupBy(SysBaseSetInfo::getDepartName));
//baseSetMapper.getFundBaseSet(fundHolds);
if (Common.isNotNull(fundBases)) { if (Common.isNotNull(fundBases)) {
for (SysBaseSetInfo set : fundBases) { for (SysBaseSetInfo set : fundBases) {
fundHoldMap.put(set.getDepartName(), set); fundHoldMap.put(set.getDepartName(), set);
......
...@@ -388,7 +388,11 @@ ...@@ -388,7 +388,11 @@
FROM sys_base_set_info a FROM sys_base_set_info a
<where> <where>
1=1 1=1
and a.APPLY_START_DATE <![CDATA[ <= ]]> now() and
(
(a.APPLY_START_DATE <![CDATA[ <= ]]> now() and a.APPLY_END_DATE >= now())
or (a.APPLY_START_DATE <![CDATA[ <= ]]> now() and a.APPLY_END_DATE is null)
)
<if test="fundHolds != null and fundHolds.size > 0"> <if test="fundHolds != null and fundHolds.size > 0">
and a.DEPART_NAME in and a.DEPART_NAME in
<foreach collection="fundHolds" item="item" open="(" close=")" separator="," > <foreach collection="fundHolds" item="item" open="(" close=")" separator="," >
......
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