Explorar o código

修改排班问题

温红权 %!s(int64=8) %!d(string=hai) anos
pai
achega
333225969d

+ 18 - 4
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserClassServiceImpl.java

@@ -42,6 +42,13 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
         //组织hash
         HashMap<String,UserClass> userClassHashMap = new HashMap<>();
         HashMap<String,UnregularUserClass> unregularUserClassHashMap = new HashMap<>();
+
+        //组织hash
+        HashMap<String,UserClass> userClassHashMaptemp = new HashMap<>();
+        HashMap<String,UnregularUserClass> unregularUserClassHashMaptemp = new HashMap<>();
+
+
+
         for (UserClass c:userClassList
              ) {
             String key = c.getDept_id()+""+c.getClass_type()+""+c.getLane()+"";
@@ -53,6 +60,9 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
             unregularUserClassHashMap.put(key,c);
         }
 
+        userClassHashMaptemp.putAll(userClassHashMap);
+        unregularUserClassHashMaptemp.putAll(unregularUserClassHashMap);
+
         StringBuffer nightClassStuff = new StringBuffer();
         StringBuffer middleClassStuff = new StringBuffer();
         StringBuffer mooringClassStuff = new StringBuffer();
@@ -81,7 +91,7 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 
 
             String key = objTemp.getDept_id()+""+objTemp.getClass_type()+""+objTemp.getLane()+"";
-            UserClass objTempDB =  userClassHashMap.get(key);
+            UserClass objTempDB =  userClassHashMaptemp.get(key);
             if(objTempDB!=null){
                 //跟新
                 objTemp.setId(objTempDB.getId());
@@ -110,7 +120,7 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 
                         //判断
                         String key1 = obj.get(j).getClass_id()+""+obj.get(j).getStart_time().getTime()+""+obj.get(j).getEnd_time().getTime()+"";
-                        UnregularUserClass unregularUserClass = unregularUserClassHashMap.get(key1);
+                        UnregularUserClass unregularUserClass = unregularUserClassHashMaptemp.get(key1);
 
                         if(unregularUserClass!=null){
                             obj.get(j).setId(unregularUserClass.getId());
@@ -124,7 +134,7 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
                         }else{
                             //插入
                             userClassDao.insert_detail2(obj.get(j));
-                            unregularUserClassHashMap.put(key1,obj.get(j));
+                            unregularUserClassHashMaptemp.put(key1,obj.get(j));
                         }
                     }
                 }
@@ -132,7 +142,7 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
             }else{
                 //插入
                 userClassDao.insert(list.get(i));
-                userClassHashMap.put(key,list.get(i));
+                userClassHashMaptemp.put(key,list.get(i));
 
                 List<UnregularUserClass> obj = list.get(i).getList() ;
                 if(obj!=null && obj.size()>0) {
@@ -145,8 +155,12 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
                         obj.get(j).setTeam_id(list.get(i).getTeam_id());
                         obj.get(j).setClass_id(list.get(i).getId());
                         obj.get(j).setMonitor_user_id(list.get(i).getMonitor_user_id());
+
+                        String key1 = obj.get(j).getClass_id()+""+obj.get(j).getStart_time().getTime()+""+obj.get(j).getEnd_time().getTime()+"";
+                        unregularUserClassHashMaptemp.put(key1,obj.get(j));
                     }
                     userClassDao.insert_detail(obj);
+
                 }
             }
         }