Commit 8288ed43 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 42f463f5
...@@ -2141,15 +2141,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2141,15 +2141,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialBases.clear(); socialBases.clear();
} }
if (Common.isNotNull(fundHolds)) { if (Common.isNotNull(fundHolds)) {
List<SysBaseSetInfo> fundBases = baseSetMapper.selectList(Wrappers.<SysBaseSetInfo>query().lambda() List<SysBaseSetInfo> fundBases = baseSetMapper.getFundBaseSet(fundHolds);
.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);
......
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