feat: 数据接口返回数据格式

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java

@@ -104,11 +104,11 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return MaterialTodayDataBO.empty();
         }
-        MaterialTodayDataBO data = JSON.parseObject(JSON.toJSONString(result.get("data")), MaterialTodayDataBO.class);
-        if (data == null) {
-            data = MaterialTodayDataBO.empty();
+        List<MaterialTodayDataBO> datas = JSON.parseArray(JSON.toJSONString(result.get("data")), MaterialTodayDataBO.class);
+        if (CollectionUtils.isEmpty(datas)) {
+            return MaterialTodayDataBO.empty();
         }
-        return data;
+        return datas.get(0);
     }
 
 
@@ -135,7 +135,11 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return new MaterialDataOverviewVO();
         }
-        return JSON.parseObject(JSON.toJSONString(result.get("data")), MaterialDataOverviewVO.class);
+        List<MaterialDataOverviewVO> datas = JSON.parseArray(JSON.toJSONString(result.get("data")), MaterialDataOverviewVO.class);
+        if (CollectionUtils.isEmpty(datas)) {
+            return new MaterialDataOverviewVO();
+        }
+        return datas.get(0);
     }
 
 
@@ -333,7 +337,6 @@ public class MaterialDataAdaptor {
             return new Page<>();
         }
         Page<MaterialStoreUsedDataVO> pageResult = new Page<>();
-        Object total = result.get("total");
         List<MaterialStoreUsedDataVO> materialStoreUsedDataVOS = JSON.parseArray(JSON.toJSONString(result.get("data")), MaterialStoreUsedDataVO.class);
         if (CollectionUtils.isNotEmpty(materialStoreUsedDataVOS)) {
             return new Page<>();