学年升级虚拟班学生未升级完善

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -322,6 +322,12 @@ public class SchoolService {
                             stusupnum = 0;
                         }
                         if (N_Utils.isListNotEmpty(xnbList)) {
+                            classIds = classes.stream().filter(c -> c.getClasstype().equals(2)).map(c -> c.getClassid().toString()).collect(Collectors.joining(","));
+                            cStudents = classMapper.listStudentByClassIds(classIds);//要升级的学生列表
+                            cTeachers = classMapper.listTeacherByClassIds(classIds);//要升级的教师列表
+                            groups = classMapper.listGroupByClassIds(classIds);//要升级的全体分组列表
+                            groupIds = groups.stream().map(g -> g.getGroupid().toString()).collect(Collectors.joining(","));
+                            gStudents = classMapper.listStudentByGroupIds(groupIds);//要升级的学生列表
                             String cIds = xnbList.stream().map(c -> c.getClassid().toString()).collect(Collectors.joining(","));
                             List<TClassStudent> studentList = new ArrayList<>();
                             for (TClassStudent cs : cStudents) {
@@ -554,8 +560,8 @@ public class SchoolService {
                         stuyupnum = bystudents.size();
                     }
 
-                    classsxznum = classMapper.updateClassState(1, xzClassIds);//修改班级状态
-                    classsxnnum = classMapper.updateClassState(1, xnClassIds);//修改班级状态
+                    if(N_Utils.isNotEmpty(xzClassIds)) classsxznum = classMapper.updateClassState(1, xzClassIds);//修改班级状态
+                    if(N_Utils.isNotEmpty(xnClassIds)) classsxnnum = classMapper.updateClassState(1, xnClassIds);//修改班级状态
                     if (N_Utils.isListNotEmpty(bystudents)) {
                         stusupnum = userMapper.batchUpdateState(bystudents, 1);//修改学生状态
                     }

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -25,7 +25,6 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static jdk.nashorn.internal.objects.Global.Infinity;
 
 /**
  * @author WN