房态接口返回数据格式修改

mhotel/src/com/happy/action/HouseNumberStatusAction.java

@@ -27,7 +27,7 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
      * 表格数据 房态管理-房态管理
      */
     public void queryData() {
-        List<?> objects = houseNumberStatusService.queryData(houseNumberStatusDto);
+        JSONObject objects = houseNumberStatusService.queryData(houseNumberStatusDto);
         if (objects != null){
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "请求成功");

mhotel/src/com/happy/service/HouseNumberStatusService.java

@@ -1,5 +1,6 @@
 package com.happy.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.happy.Model.HouseNumberStatus;
 import com.happy.dto.HouseNumberStatusDto;
 
@@ -11,7 +12,7 @@ public interface HouseNumberStatusService {
     /**
      * 表格数据 房态管理-房态管理
      */
-    List<?> queryData(HouseNumberStatusDto houseNumberStatusDto);
+    JSONObject queryData(HouseNumberStatusDto houseNumberStatusDto);
 
     /**
      * 查询可置脏/净、可开/关的房型及房间号 房态管理-房态管理

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

@@ -43,10 +43,10 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
     }
 
     @Override
-    public List<?> queryData(HouseNumberStatusDto houseNumberStatusDto) {
+    public JSONObject queryData(HouseNumberStatusDto houseNumberStatusDto) {
         String managerId = houseNumberStatusDto.getManagerId();
         Integer showType = houseNumberStatusDto.getShowType();
-        if (StringUtils.isBlank(managerId) || showType == null) return Collections.emptyList();
+        if (StringUtils.isBlank(managerId) || showType == null) return null;
         List<House> houseList = housePriceService.queryHouseListByManagerId(houseNumberStatusDto.getManagerId());
         if (houseList.isEmpty()) return null;
         List<HouseNumber> houseNumberList = houseNumberDao.queryListByHouseIdList(houseList.stream().map(House::getId).collect(Collectors.toList()));
@@ -122,8 +122,8 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
             housePriceDto.setSetDate(setDateWithEndDate);
             List<HousePriceDto> housePriceDtoList = housePriceDao.queryListTwo(housePriceDto);
             //endregion
-
-            List<JSONObject> result = new ArrayList<>();
+            List<JSONObject> datas = new ArrayList<>();
+            JSONObject result = new JSONObject(new LinkedHashMap<>());
             houseList.forEach(house -> houseNumberList.forEach(houseNumber -> {
                 if (houseNumber.getHouseId().equals(house.getId())) {
                     JSONObject houseJsonObject = new JSONObject(new LinkedHashMap<>());
@@ -136,7 +136,6 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
                         dateJsonObject.put("numberId", houseNumber.getId());
                         dateJsonObject.put("houseName", house.gethName());
                         dateJsonObject.put("numberName", numberName);
-                        dateJsonObject.put("sum", getSum(date,houseNumberList));
                         dateJsonObject.put("housePrice", getPrice(DateUtil.parseDateOnly(date), house, housePriceDtoList));
                         List<HouseNumberStatusDto> houseNumberStatuses = houseNumber.getHouseNumberStatuses();
                         if (houseNumberStatuses != null && !houseNumberStatuses.isEmpty()){
@@ -159,13 +158,25 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
                         }
                         houseJsonObject.put(date, dateJsonObject);
                     });
-                    result.add(houseJsonObject);
+                    datas.add(houseJsonObject);
                 }
             }));
+            ArrayList<JSONObject> dataTimes = new ArrayList();
+            dateListBetween.forEach(date->{
+                JSONObject dataTime = new JSONObject();//
+                dataTime.put("dateStr",date);
+                dataTime.put("roomSum",getSum(date,houseNumberList));
+                dataTimes.add(dataTime);
+            });
+
+            result.put("dateTimes", dataTimes);
+            result.put("datas",datas);
             return result;
         }
         if (houseNumberStatusDto.getShowType() == 2) {
-            return buildResultOne(houseList, houseNumberList);
+            JSONObject result = new JSONObject(new LinkedHashMap<>());
+            result.put("data",buildResultOne(houseList, houseNumberList));
+            return result;
         }
         return null;
     }