|
@@ -3730,7 +3730,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
long until = state.until(end, ChronoUnit.DAYS);
|
|
long until = state.until(end, ChronoUnit.DAYS);
|
|
|
|
|
|
|
|
Integer count = 1;
|
|
Integer count = 1;
|
|
|
- List<Integer> idList =new ArrayList<>();
|
|
|
|
|
|
|
+ List<String> idList =new ArrayList<>();
|
|
|
if (dayDiff + until > 2) {
|
|
if (dayDiff + until > 2) {
|
|
|
count = 0;
|
|
count = 0;
|
|
|
} else {
|
|
} else {
|
|
@@ -3753,13 +3753,13 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
count = 0;
|
|
count = 0;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
- idList.add(Integer.valueOf(scheduleList.get(0).getId()));
|
|
|
|
|
|
|
+ idList.add(scheduleList.get(0).getId());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
vo.setCount(count);
|
|
vo.setCount(count);
|
|
|
- vo.setSourceId(idList.toString());
|
|
|
|
|
|
|
+ vo.setSourceId(StringUtils.collectionToDelimitedString(idList,""));
|
|
|
vo.setDays((int) (until-dayDiff));
|
|
vo.setDays((int) (until-dayDiff));
|
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
|
vos.add(vo);
|
|
vos.add(vo);
|