Merge branch 'feature-2024-08-喜好洞察优化' into 'developer'

时间趋势优化

See merge request !2144

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/GoodsAnalysisController.java

@@ -139,10 +139,7 @@ public class GoodsAnalysisController {
     public RestResponse<Page<GoodsAnalysisDateTrendVO>> getDateTrendOfManager(@RequestBody GoodsAnalysisClerkDetailQO qo) {
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo);
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_pro_pref_ent_date_overview");
-        Page page = DataApiUtils.getPageData(res);
-        List<JSONObject> pageList = page.getResult();
-
-        page.setResult(JSONArray.parseArray(JSON.toJSONString(pageList), GoodsAnalysisDateTrendVO.class));
+        Page<GoodsAnalysisDateTrendVO> page = DataApiUtils.getPageData(res, GoodsAnalysisDateTrendVO.class);
         return RestResponse.successResult(page);
     }
 
@@ -170,10 +167,7 @@ public class GoodsAnalysisController {
     public RestResponse<Page<ClerkDateTrendVO>> getDateTrendOfClerk(@RequestBody GoodsAnalysisClerkDetailQO qo) {
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo);
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_pro_pref_clerk_date_overview");
-        Page page = DataApiUtils.getPageData(res);
-        List<JSONObject> pageList = page.getResult();
-
-        page.setResult(JSONArray.parseArray(JSON.toJSONString(pageList), ClerkDateTrendVO.class));
+        Page<ClerkDateTrendVO> page = DataApiUtils.getPageData(res, ClerkDateTrendVO.class);
         return RestResponse.successResult(page);
     }