于紫祥_1901
2020-12-01 636af927431b46a0788b7d76233387923135ac0c
src/main/java/com/moral/controller/ScreenController.java
@@ -2963,25 +2963,25 @@
            rList.add(null);
        }else {
            for (int j = 0; j < lists.get(0).size(); j++) {
                Map<String,Object> listMap = new HashMap();
                List<Map> mapList=new ArrayList<>();
                if (lists.get(0).size()==1){
                Map<String, Object> listMap = new HashMap();
                List<Map> mapList = new ArrayList<>();
                if (lists.get(0).size() == 1) {
                    mapList.add(null);
                }else {
                } else {
                    mapList.add((Map) lists.get(0).get(j).get("data"));
                }
                    for (int i = 1; i < lists.size(); i++) {
                        if (lists.get(i).size()==1){
                            mapList.add(null);
                            listMap.put("data",mapList);
                        }else {
                            if (lists.get(0).get(j).get("time").equals(lists.get(i).get(j).get("time"))){
                                mapList.add((Map) lists.get(i).get(j).get("data"));
                            }
                            listMap.put("time",lists.get(0).get(j).get("time"));
                            listMap.put("data",mapList);
                for (int i = 1; i < lists.size(); i++) {
                    if (lists.get(i).size() == 1) {
                        mapList.add(null);
                        listMap.put("data", mapList);
                    } else {
                        if (lists.get(0).get(j).get("time").equals(lists.get(i).get(j).get("time"))) {
                            mapList.add((Map) lists.get(i).get(j).get("data"));
                        }
                        listMap.put("time", lists.get(0).get(j).get("time"));
                        listMap.put("data", mapList);
                    }
                }
                rList.add(listMap);
            }
        }