From 06d6372b451b964738cbfe2adb37e1da85d856ed Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期四, 24 十一月 2022 16:05:03 +0800
Subject: [PATCH] 新增

---
 src/main/java/com/qxueyou/scc/controller/SchoolRollController.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 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..b204a3e 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;
@@ -45,8 +46,8 @@
 
         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));
     }
 
@@ -56,9 +57,9 @@
      * @return
      */
     @ApiOperation(value = "给学员分配班级", notes = "")
-    @PutMapping(value = "/updateSchoolClass")
-    public String updateSchoolClass(String StudentId,String ClassId) {
-        return iSchoolRollService.updateSchool(StudentId, ClassId);
+    @GetMapping(value = "/updateSchoolClass")
+    public Result updateSchoolClass(String [] studentIds,String classId) {
+        return iSchoolRollService.updateSchool(studentIds, classId);
     }
 
     /**
@@ -67,9 +68,9 @@
      * @return
      */
     @ApiOperation(value = "审核学员并生成学号", notes = "")
-    @PutMapping(value = "/auditStudent")
-    public Boolean auditStudent(String StudentId) {
-        return iSchoolRollService.auditStudent(StudentId);
+    @GetMapping(value = "/auditStudent")
+    public Result auditStudent(String studentIds) {
+        return iSchoolRollService.loopStudentIds(studentIds.split(","));
     }
 
     /**
@@ -83,4 +84,18 @@
         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