diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java index fc121cc..7c05b15 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import com.alibaba.fastjson.JSONObject; import com.hbt.safety.supervision.mapper.HiddenDangerMapper; import com.hbt.safety.supervision.pojo.HiddenDanger; +import com.hbt.safety.supervision.pojo.vo.StatisticsVo; import com.hbt.safety.supervision.service.IHiddenDangerService; import com.hbt.safety.supervision.util.YearWeeksUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -107,11 +108,14 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService Map> hiddenDangerMap = list.stream() .collect(Collectors.groupingBy(HiddenDanger::getReformStatus)); // 组装隐患状态统计数据 - Map hiddenDangerList = new HashMap<>(); + List hiddenDangerList = new ArrayList<>(); for(Object key : hiddenDangerMap.keySet()) { - hiddenDangerList.put(key, hiddenDangerMap.get(key).size()); + StatisticsVo statisticsVo = new StatisticsVo(); + statisticsVo.setClassify(Integer.parseInt(key.toString())); + statisticsVo.setCount(hiddenDangerMap.get(key).size()); + hiddenDangerList.add(statisticsVo); } - map.put("hiddenDangerList", hiddenDangerList); + map.put("hiddenDangerList", JSONObject.toJSONString(hiddenDangerList)); return JSONObject.toJSONString(map); }