|
@ -1388,11 +1388,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { |
|
|
itemWrapper.in(ItemEntity::getId, formDTO.getItemIdList()); |
|
|
itemWrapper.in(ItemEntity::getId, formDTO.getItemIdList()); |
|
|
} |
|
|
} |
|
|
List<ItemEntity> items = itemDao.selectList(itemWrapper); |
|
|
List<ItemEntity> items = itemDao.selectList(itemWrapper); |
|
|
|
|
|
Date date = DateUtils.addDateDays(DateUtils.parse(DateUtils.format(new Date(), DateUtils.DATE_PATTERN), DateUtils.DATE_PATTERN), formDTO.getDays()); |
|
|
if (CollectionUtils.isNotEmpty(items)) { |
|
|
if (CollectionUtils.isNotEmpty(items)) { |
|
|
//提取未结案诉求的sqID
|
|
|
//提取未结案诉求的sqID
|
|
|
List<String> sqIdList = items.stream().filter(i -> i.getItemState() == NumConstant.ZERO).map(ItemEntity::getSqid).collect(Collectors.toList()); |
|
|
List<String> sqIdList = items.stream().filter(i -> i.getItemState() == NumConstant.ZERO).map(ItemEntity::getSqid).collect(Collectors.toList()); |
|
|
//提取已结案诉求的sqID
|
|
|
//提取已结案诉求的sqID,并且结案时间在date之后的
|
|
|
List<String> closedSqIdList = items.stream().filter(i -> i.getItemState() == NumConstant.TEN).map(ItemEntity::getSqid).collect(Collectors.toList()); |
|
|
List<String> closedSqIdList = items.stream().filter(i -> i.getItemState() == NumConstant.TEN && i.getUpdatedTime().after(date)).map(ItemEntity::getSqid).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(sqIdList)) { |
|
|
if (CollectionUtils.isNotEmpty(sqIdList)) { |
|
|
extracted(sqIdList, NumConstant.ZERO); |
|
|
extracted(sqIdList, NumConstant.ZERO); |
|
|