From 3f82cda34b6c7d9243b62df2509a9e5fd711c184 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期一, 14 八月 2023 17:58:45 +0800
Subject: [PATCH] ｚｈｙｌｙ登录

---
 src/main/java/com/qxueyou/scc/controller/SchoolRollController.java |   51 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java b/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java
index 3b3ffad..33da0aa 100644
--- a/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java
+++ b/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java
@@ -1,5 +1,6 @@
 package com.qxueyou.scc.controller;
 
+import com.qxueyou.scc.admin.classes.model.ClsClass;
 import com.qxueyou.scc.admin.schoolRoll.ISchoolRollService;
 import com.qxueyou.scc.base.model.Pager;
 import com.qxueyou.scc.base.model.Result;
@@ -15,11 +16,11 @@
 import java.util.List;
 
 /**
- * 学籍管理控制器
+ * 瀛︾睄绠＄悊鎺у埗鍣�
  *
  * @author hurenrong
  */
-@Api(tags="学籍管理接口")
+@Api(tags="瀛︾睄绠＄悊鎺ュ彛")
 @RestController
 @RequestMapping("/admin/schoolRoller")
 public class SchoolRollController {
@@ -28,14 +29,14 @@
     private ISchoolRollService iSchoolRollService;
 
     /**
-     * 获取正常学员列表
+     * 鑾峰彇姝ｅ父瀛﹀憳鍒楄〃
      *
      * @param keyword
      * @param limit
      * @param pageNum
      * @return
      */
-    @ApiOperation(value = "获取正学籍列表", notes = "")
+    @ApiOperation(value = "鑾峰彇瀛︾睄鍒楄〃", notes = "")
     @GetMapping(value = "/schoolList")
     public Result schoolList(@RequestParam(defaultValue = "10") Integer limit, @RequestParam(defaultValue = "1") Integer pageNum,String keyword,String status) {
 
@@ -45,42 +46,56 @@
 
         return new Result(true,"success", CollectionUtils.newObjectMap("schoolRollList",
                 QBeanUtils.listBean2ListMap(schoolRollList,
-                        CollectionUtils.newStringMap("name", "studentName", "studentNo", "studentNo","sex","sex", "status",
-                                "status", "createTime", "createTime")),
+                        CollectionUtils.newStringMap("name", "studentName","studentId","studentId", "studentNo", "studentNo","sex","sex", "status",
+                                "status", "createTime", "createTime","mobilePhone","mobilePhone","studentNumber","studentNumber")),
                 "schoolrollCount", count));
     }
 
     /**
-     * 给学员分配班级
+     * 缁欏鍛樺垎閰嶇彮绾�
      *
      * @return
      */
-    @ApiOperation(value = "给学员分配班级", notes = "")
-    @PutMapping(value = "/updateSchoolClass")
-    public String updateSchoolClass(String StudentId,String ClassId) {
-        return iSchoolRollService.updateSchool(StudentId, ClassId);
+    @ApiOperation(value = "缁欏鍛樺垎閰嶇彮绾�", notes = "")
+    @GetMapping(value = "/updateSchoolClass")
+    public Result updateSchoolClass(String [] studentIds,String classId) {
+        return iSchoolRollService.updateSchool(studentIds, classId);
     }
 
     /**
-     * 审核学员并生成学号
+     * 瀹℃牳瀛﹀憳骞剁敓鎴愬鍙�
      *
      * @return
      */
-    @ApiOperation(value = "审核学员并生成学号", notes = "")
-    @PutMapping(value = "/auditStudent")
-    public Boolean auditStudent(String StudentId) {
-        return iSchoolRollService.auditStudent(StudentId);
+    @ApiOperation(value = "瀹℃牳瀛﹀憳骞剁敓鎴愬鍙�", notes = "")
+    @GetMapping(value = "/auditStudent")
+    public Result auditStudent(String studentIds) {
+        return iSchoolRollService.loopStudentIds(studentIds.split(","));
     }
 
     /**
-     * 导出学员信息
+     * 瀵煎嚭瀛﹀憳淇℃伅
      *
      * @return
      */
-    @ApiOperation(value = "导出学员信息", notes = "")
+    @ApiOperation(value = "瀵煎嚭瀛﹀憳淇℃伅", notes = "")
     @GetMapping(value = "/deriveStudentMessage")
     public void deriveStudentMessage(String StudentId,String ClassId) {
         iSchoolRollService.deriveStudentMessage();
     }
 
+    /**
+     * 鏌ヨ鐝骇
+     *
+     * @return
+     */
+    @ApiOperation(value = "鏌ヨ鐝骇", notes = "")
+    @GetMapping(value = "/findClass")
+    public Result findClass() {
+        List<ClsClass> aClass = iSchoolRollService.findClass();
+        return new Result(true,"success",CollectionUtils.newObjectMap("schoolRollList",  QBeanUtils.listBean2ListMap(aClass,
+                CollectionUtils.newStringMap("name","classname","classId","classId"))
+                ));
+    }
+
 }

--
Gitblit v1.8.0