From 138ccc9fe4798e5335c49a6407e8cdc70e1ff122 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期四, 24 十一月 2022 16:06:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/controller/SchoolRollController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java b/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java
index f98dcf2..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;
@@ -10,10 +11,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -38,7 +36,7 @@
* @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) {
@@ -48,8 +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 = "")
+ @GetMapping(value = "/updateSchoolClass")
+ public Result updateSchoolClass(String [] studentIds,String classId) {
+ return iSchoolRollService.updateSchool(studentIds, classId);
+ }
+
+ /**
+ * 审核学员并生成学号
+ *
+ * @return
+ */
+ @ApiOperation(value = "审核学员并生成学号", notes = "")
+ @GetMapping(value = "/auditStudent")
+ public Result auditStudent(String studentIds) {
+ return iSchoolRollService.loopStudentIds(studentIds.split(","));
+ }
+
+ /**
+ * 导出学员信息
+ *
+ * @return
+ */
+ @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