Commit fe1cac93eb80fc2f8d1c060d6073f6105bc0f6ec
1 parent
70906c72d3
Exists in
master
and in
6 other branches
全部孕妇管理增加按照排序
Showing 1 changed file with 21 additions and 18 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
View file @
fe1cac9
| ... | ... | @@ -200,30 +200,33 @@ |
| 200 | 200 | * @return |
| 201 | 201 | */ |
| 202 | 202 | public Map reportList(Integer userId, String id) { |
| 203 | - TempModel tem = tempService.findOneById(id); | |
| 203 | + TempQuery tempQuery = new TempQuery(); | |
| 204 | + tempQuery.setpIds(Arrays.asList(new String[]{id})); | |
| 205 | + List<TempModel> tem = tempService.queryTemp(tempQuery); | |
| 204 | 206 | Assert.notNull(tem, "查看的记录已被删除"); |
| 205 | - LinkedHashMap<String, Double> data = tem.getTempList(); | |
| 207 | + List<String> time = new ArrayList<>(); | |
| 208 | + List<String> temp1 = new ArrayList<>(); | |
| 206 | 209 | Map map = new HashMap(); |
| 207 | 210 | map.put("errorcode", ErrorCodeConstants.SUCCESS); |
| 208 | 211 | map.put("errormsg", "成功"); |
| 209 | - List<String> time = new ArrayList<>(); | |
| 210 | - List<String> temp = new ArrayList<>(); | |
| 211 | - map.put("time", time); | |
| 212 | - map.put("temp", temp); | |
| 213 | - if (null == data || data.isEmpty()) { | |
| 214 | - return map; | |
| 215 | - } | |
| 216 | - /* Set<Map.Entry<String, Double>> set = data.entrySet(); | |
| 212 | + if (CollectionUtils.isNotEmpty(tem)) { | |
| 213 | + LinkedHashMap<String, Double> data1=new LinkedHashMap<>(); | |
| 214 | + for (TempModel temp : tem) { | |
| 215 | + LinkedHashMap<String, Double> data = temp.getTempList(); | |
| 216 | + if (null == data || data.isEmpty()) { | |
| 217 | + continue; | |
| 218 | + } | |
| 219 | + data1.putAll(temp.getTempList()); | |
| 220 | + } | |
| 217 | 221 | |
| 218 | - ArrayList<Map.Entry<String, Double>> da = new ArrayList<Map.Entry<String, Double>>(set); | |
| 219 | - Collections.reverse(da);*/ | |
| 220 | - ; | |
| 221 | - | |
| 222 | - for (int i = 0; i < 7; i++) { | |
| 223 | - String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i)); | |
| 224 | - time.add(t); | |
| 225 | - temp.add(String.valueOf(data.get(t))); | |
| 222 | + for (int i = 0; i < 7; i++) { | |
| 223 | + String t = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), -i)); | |
| 224 | + time.add(t); | |
| 225 | + temp1.add(String.valueOf(data1.get(t))); | |
| 226 | + } | |
| 226 | 227 | } |
| 228 | + map.put("time", time); | |
| 229 | + map.put("temp", temp1); | |
| 227 | 230 | return map; |
| 228 | 231 | } |
| 229 | 232 |