diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java index 925edb3..b173076 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java @@ -200,30 +200,33 @@ public class TempFacade { * @return */ public Map reportList(Integer userId, String id) { - TempModel tem = tempService.findOneById(id); + TempQuery tempQuery = new TempQuery(); + tempQuery.setpIds(Arrays.asList(new String[]{id})); + List tem = tempService.queryTemp(tempQuery); Assert.notNull(tem, "查看的记录已被删除"); - LinkedHashMap data = tem.getTempList(); + List time = new ArrayList<>(); + List temp1 = new ArrayList<>(); Map map = new HashMap(); map.put("errorcode", ErrorCodeConstants.SUCCESS); map.put("errormsg", "成功"); - List time = new ArrayList<>(); - List temp = new ArrayList<>(); - map.put("time", time); - map.put("temp", temp); - if (null == data || data.isEmpty()) { - return map; - } - /* Set> set = data.entrySet(); - - ArrayList> da = new ArrayList>(set); - Collections.reverse(da);*/ - ; + if (CollectionUtils.isNotEmpty(tem)) { + LinkedHashMap data1=new LinkedHashMap<>(); + for (TempModel temp : tem) { + LinkedHashMap data = temp.getTempList(); + if (null == data || data.isEmpty()) { + continue; + } + data1.putAll(temp.getTempList()); + } - for (int i = 0; i < 7; i++) { - String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i)); - time.add(t); - temp.add(String.valueOf(data.get(t))); + for (int i = 0; i < 7; i++) { + String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i)); + time.add(t); + temp1.add(String.valueOf(data1.get(t))); + } } + map.put("time", time); + map.put("temp", temp1); return map; }