diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java index 370583b6..70675b16 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java @@ -2,6 +2,8 @@ package com.njcn.gather.event.transientes.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.StrUtil; @@ -33,6 +35,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -261,8 +264,9 @@ public class EventRightServiceImpl implements EventRightService { @Override public Page rightEventDevOpen(LargeScreenCountParam param) { - LocalDateTime startTime = param.getStartTime().atStartOfDay(); - LocalDateTime endTime = LocalDateTimeUtil.endOfDay(param.getEndTime().atStartOfDay()); + DateTime startTime = DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + DateTime endTime = DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + Page result = new Page<>(PageFactory.getPageNum(param),PageFactory.getPageSize(param)); List lineIds = commGeneralService.getLineIdsByRedis(param.getDeptId()); @@ -275,7 +279,18 @@ public class EventRightServiceImpl implements EventRightService { List userIds = assPOList.stream().map(PqUserLineAssPO::getUserIndex).collect(Collectors.toList()); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(PqUserLedgerPO::getId,userIds); + + if(userIds.size() > 1000){ + List> userIdList = CollUtil.split(userIds,1000); + lambdaQueryWrapper.and(ad->{ + for(List ids : userIdList){ + ad.or(o->o.in(PqUserLedgerPO::getId,ids)); + } + }); + }else { + lambdaQueryWrapper.in(PqUserLedgerPO::getId,userIds); + } + if(StrUtil.isNotBlank(param.getBigObjType())){ //对象大类不为空 lambdaQueryWrapper.eq(PqUserLedgerPO::getBigObjType,param.getBigObjType());