房价查询新增显示时间字段

mhotel/src/com/happy/service/impl/HousePriceServiceImpl.java

@@ -63,6 +63,7 @@ public class HousePriceServiceImpl implements HousePriceService {
     @Override
     public JSONObject queryPage(HousePriceDto housePriceDto, Integer pageNumber, Integer pageSize) {
         List<JSONObject> pageJsonObjectList = new ArrayList<>(Collections.emptyList());
+        List<JSONObject> dataTimes = new ArrayList<>(Collections.emptyList());
         int total = housePriceDao.queryTotalOne(housePriceDto);
         if (total != 0) {
             List<HousePriceDto> pageList = housePriceDao.queryListOne(housePriceDto, pageNumber, pageSize);
@@ -78,16 +79,25 @@ public class HousePriceServiceImpl implements HousePriceService {
             //endregion
 
             List<Date> dateListBetween = DateUtil.getDateListBetween(startDate, endDate);
+            dateListBetween.forEach(date -> {
+                JSONObject time = new JSONObject(new LinkedHashMap<>());
+                time.put("dateStr",DateUtil.parseDateToStr(date, DateUtil.Time_Formatter_Day));
+                dataTimes.add(time);
+            });
             pageList.forEach(item -> {
                 JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
+
                 jsonObject.put("id", item.getHouseId());
                 jsonObject.put("houseName", item.getHouseName());
-                dateListBetween.forEach(date -> jsonObject.put(DateUtil.parseDateToStr(date, DateUtil.Time_Formatter_Day), getPrice(date, item, housePriceDtoList)));
+                dateListBetween.forEach(date -> {
+                    jsonObject.put(DateUtil.parseDateToStr(date, DateUtil.Time_Formatter_Day), getPrice(date, item, housePriceDtoList));
+                });
                 pageJsonObjectList.add(jsonObject);
             });
         }
         JSONObject result = new JSONObject();
         result.put("pageList", pageJsonObjectList);
+        result.put("dateTimes",dataTimes);
         result.put("page", pageNumber);
         result.put("rows", pageSize);
         result.put("total", total);