diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/GetAbnormalDataFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/GetAbnormalDataFormDTO.java index ed7707c7d..9895b3f49 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/GetAbnormalDataFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/GetAbnormalDataFormDTO.java @@ -19,5 +19,6 @@ public class GetAbnormalDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; private List itemIdList; private String date; + private Integer days = 0; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 6bac29129..339c957e2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -1388,11 +1388,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { itemWrapper.in(ItemEntity::getId, formDTO.getItemIdList()); } List 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)) { //提取未结案诉求的sqID List sqIdList = items.stream().filter(i -> i.getItemState() == NumConstant.ZERO).map(ItemEntity::getSqid).collect(Collectors.toList()); - //提取已结案诉求的sqID - List closedSqIdList = items.stream().filter(i -> i.getItemState() == NumConstant.TEN).map(ItemEntity::getSqid).collect(Collectors.toList()); + //提取已结案诉求的sqID,并且结案时间在date之后的 + List closedSqIdList = items.stream().filter(i -> i.getItemState() == NumConstant.TEN && i.getUpdatedTime().after(date)).map(ItemEntity::getSqid).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(sqIdList)) { extracted(sqIdList, NumConstant.ZERO);