gengyang 5 лет назад
Родитель
Сommit
8b8e3b54fe

+ 6 - 1
src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java

@@ -148,6 +148,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         if (list.size() > 0) {
             List<Integer> ids = list.stream().map(WorkRoomVo -> WorkRoomVo.getId()).collect(Collectors.toList());
             HashMap<Integer, HashMap<String, Integer>> dataById = getDataById(ids);
+            System.out.println(dataById);
 
             QueryWrapper<WorkRoomVo> tagObj = new QueryWrapper<WorkRoomVo>();
             tagObj.in("a.id", ids);
@@ -362,6 +363,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         HashMap<String, Integer> temp = new HashMap<String, Integer>();
         for (WorkContactRoomGroupDataVo o : totals) {
+            temp = new HashMap<String, Integer>();
             temp.put("total", o.getNum());
             temp.put("add_num", 0);
             temp.put("left_num", 0);
@@ -371,11 +373,13 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         HashMap<String, Integer> tempSetLeft = new HashMap<String, Integer>();
         for (WorkContactRoomGroupDataVo l : todayLefts) {
             if (dataById.get(l.getRoomId()) == null) {//不存在
+                temp = new HashMap<String, Integer>();
                 temp.put("total", 0);
                 temp.put("left_num", l.getNum());
                 temp.put("add_num", 0);
                 dataById.put(l.getRoomId(), temp);
             } else {
+                tempSetLeft = new HashMap<String, Integer>();
                 tempSetLeft = dataById.get(l.getRoomId());
                 tempSetLeft.put("left_num", l.getNum());
                 dataById.put(l.getRoomId(), tempSetLeft);
@@ -385,11 +389,13 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         HashMap<String, Integer> tempSetAdd = new HashMap<String, Integer>();
         for (WorkContactRoomGroupDataVo a : todayAdds) {
             if (dataById.get(a.getRoomId()) == null) {
+                temp = new HashMap<String, Integer>();
                 temp.put("total", 0);
                 temp.put("add_num", a.getNum());
                 temp.put("left_num", 0);
                 dataById.put(a.getRoomId(), temp);
             } else {
+                tempSetAdd = new HashMap<String, Integer>();
                 tempSetAdd = dataById.get(a.getRoomId());
                 tempSetAdd.put("add_num", a.getNum());
                 dataById.put(a.getRoomId(), tempSetAdd);
@@ -397,7 +403,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         }
 
         return dataById;
-
     }