|
|
@@ -26,6 +26,9 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
public class HousePriceAction extends BaseController implements ModelDriven<HousePriceDto> {
|
|
|
|
|
|
+ private HttpServletRequest request;
|
|
|
+ public HttpServletResponse response;
|
|
|
+
|
|
|
/**
|
|
|
* 房型ID
|
|
|
*/
|
|
|
@@ -352,7 +355,7 @@ public class HousePriceAction extends BaseController implements ModelDriven<Hous
|
|
|
for (String dateStr : dateStrs) {
|
|
|
HousePriceResultVo data = new HousePriceResultVo();
|
|
|
data.setDate(dateStr);
|
|
|
- List<HousePriceOneDataVo> datas = oneDatas.stream().filter(e -> e.getSetDate().equals(dateStr)).sorted(Comparator.comparing(HousePriceOneDataVo::getPrice)).collect(Collectors.toList());
|
|
|
+ List<HousePriceOneDataVo> datas = oneDatas.stream().filter(e -> e.getSetDate().equals(dateStr)).sorted(Comparator.comparing(HousePriceOneDataVo::getCreateDate,Comparator.reverseOrder())).collect(Collectors.toList());
|
|
|
|
|
|
if(dateStr.equals(endTime)){
|
|
|
data.setTopinfo("离店时间");
|