自动分班功能调整

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -339,14 +339,7 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
             if(nameList.size() == number){
                 continue;
             }
-            List<BaseNewStudent> studentList = new ArrayList<>();
-            studentList.addAll(baseNewStudents);
-            if(ruleCodes.contains("BR0002") && classStudentMap.get(taskClass.getMajorSetId()) != null && !classStudentMap.get(taskClass.getMajorSetId()).isEmpty()){
-                studentList.clear();
-                studentList.addAll(classStudentMap.get(taskClass.getMajorSetId()));
-            }
-
-            for (BaseNewStudent newStudent : studentList) {
+            for (BaseNewStudent newStudent : baseNewStudents) {
                 //人数已满，进行下一个班级的的循环
                 if(nameList.size() == number){
                     break;

src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -3,8 +3,6 @@ package com.xjrsoft.module.student.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -36,7 +34,6 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -188,4 +185,10 @@ public class BaseNewStudentController {
         return RT.ok(result);
     }
 
+    @PostMapping("/active-account")
+    @ApiOperation(value = "激活账号")
+    public RT<Boolean> activeAccount(@RequestParam MultipartFile file) throws IOException {
+        return RT.ok(true);
+    }
+
 }