修改评价统计更新与组合查询

bill-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueStatController.java

@@ -80,18 +80,23 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
             Map<String, String> windowFromnumMap = cacheService.hgetAll(RedisKey.KEY_SITE_QUEUE_WINDOW_CHCHE + siteId);
             Map<String, String> bussinessMap = cacheService.hgetAll(RedisKey.KEY_SITE_QUEUE_BUSNIESS_CHCHE + siteId);
 
-            List<Map<String, Integer>> m1 = sectionNameMap.entrySet().stream()
+            List<Map<String, String>> m1 = sectionNameMap.entrySet().stream()
                     .sorted((e1, e2) -> Integer.compare(Integer.parseInt(e2.getValue()), Integer.parseInt(e1.getValue())))
-                    .map(item->{
-                        Map<String, Integer> map = new HashMap<>();
-                        map.put(item.getKey(), Integer.parseInt(item.getValue()));
-                        return map;
-                    }).collect(Collectors.toList());
+                    .map(item->new HashMap<String,String>(){{ put(item.getKey(), item.getValue());}}).collect(Collectors.toList());
+            List<Map<String, String>> m2 = hallNameMap.entrySet().stream()
+                    .sorted((e1, e2) -> Integer.compare(Integer.parseInt(e2.getValue()), Integer.parseInt(e1.getValue())))
+                    .map(item->new HashMap<String,String>(){{ put(item.getKey(), item.getValue());}}).collect(Collectors.toList());
+            List<Map<String, String>> m3 = windowFromnumMap.entrySet().stream()
+                    .sorted((e1, e2) -> Integer.compare(Integer.parseInt(e2.getValue()), Integer.parseInt(e1.getValue())))
+                    .map(item->new HashMap<String,String>(){{ put(item.getKey(), item.getValue());}}).collect(Collectors.toList());
+            List<Map<String, String>> m4 = bussinessMap.entrySet().stream()
+                    .sorted((e1, e2) -> Integer.compare(Integer.parseInt(e2.getValue()), Integer.parseInt(e1.getValue())))
+                    .map(item->new HashMap<String,String>(){{ put(item.getKey(), item.getValue());}}).collect(Collectors.toList());
 
             this.addDict(model, "sectionNameList", m1);
-            this.addDict(model, "hallNameList", hallNameMap);
-            this.addDict(model, "windowFromnumList", windowFromnumMap);
-            this.addDict(model, "businessList", bussinessMap);
+            this.addDict(model, "hallNameList", m2);
+            this.addDict(model, "windowFromnumList", m3);
+            this.addDict(model, "businessList", m4);
             this.addDict(model, "groupList", GroupListEnum.getEnumMap());
         }