Commit 01737bd3 by guojx

活码数据统计-趋势图补0

parent c57b62fe
...@@ -290,7 +290,11 @@ public class HmQrcodeController { ...@@ -290,7 +290,11 @@ public class HmQrcodeController {
StatisticsDTO dto = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_trend_m, hmTrendQO); StatisticsDTO dto = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_trend_m, hmTrendQO);
list = JSON.parseArray(JSON.toJSONString(dto.getData()), Map.class); list = JSON.parseArray(JSON.toJSONString(dto.getData()), Map.class);
} }
if (hmTrendVO != null) { if (hmTrendVO == null) {
hmTrendVO = new HmTrendVO();
hmTrendVO.setAddNum(0);
hmTrendVO.setAddNumT(0);
}
//日期补充 //日期补充
List<String> dateList = DateUtils.getDateList(hmTrendQO.getInFields().getStartTime(), hmTrendQO.getInFields().getEndTime(), type); List<String> dateList = DateUtils.getDateList(hmTrendQO.getInFields().getStartTime(), hmTrendQO.getInFields().getEndTime(), type);
Map<String, Object> trendMap = new HashMap<>(); Map<String, Object> trendMap = new HashMap<>();
...@@ -311,7 +315,6 @@ public class HmQrcodeController { ...@@ -311,7 +315,6 @@ public class HmQrcodeController {
list.add(vo); list.add(vo);
} }
hmTrendVO.setDateList(list); hmTrendVO.setDateList(list);
}
return RestResponse.successResult(hmTrendVO); return RestResponse.successResult(hmTrendVO);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment