From 691f717df93c32d89b13f7f73f0678441d60c840 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 24 十一月 2023 10:17:40 +0800
Subject: [PATCH] 新增班级班主任字段
---
src/main/java/com/qxueyou/scc/controller/ClassController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/ClassController.java b/src/main/java/com/qxueyou/scc/controller/ClassController.java
index e377ae4..9297e56 100644
--- a/src/main/java/com/qxueyou/scc/controller/ClassController.java
+++ b/src/main/java/com/qxueyou/scc/controller/ClassController.java
@@ -242,10 +242,10 @@
*/
@PostMapping(value = "add")
public Result add(String className, String classNumber, String startTime, String endTime, String subjectId,
- String teacherId) {
+ String teacherId,String chargeClassName ) {
try {
return classService.insertClass(className, classNumber, DateUtils.convertStringToDate(startTime),
- DateUtils.convertStringToDate(endTime), subjectId, teacherId);
+ DateUtils.convertStringToDate(endTime), subjectId, teacherId,chargeClassName);
} catch (ParseException e) {
log.error(e, e);
@@ -312,9 +312,9 @@
int count = classService.getClassLstCount(keyword, teacherId, pageType);
// 杞垚鍓嶇鎵�闇�瀛楁鍜岀粨鏋�
List<Map<String, Object>> lstResult = QBeanUtils.listBean2ListMap(clsLst,
- CollectionUtils.newStringMap("chargeClassName","chargeClassId","name", "className", "classId", "classId", "classNumber", "classNumber","classTypes","classTypes",
+ CollectionUtils.newStringMap("name", "className", "classId", "classId", "classNumber", "classNumber","classTypes","classTypes",
"studentCount", "studentCount", "createTime", "createTime", "startTime", "startTime", "endTime",
- "endTime", "subjects", "sbjLst"));
+ "endTime", "subjects", "sbjLst","chargeClassName","chargeClassName","chargeClassId","chargeClassId"));
// 鍗曠嫭澶勭悊璇剧▼鐨勫瓧娈靛拰缁撴瀯
for (Map<String, Object> item : lstResult) {
@@ -427,6 +427,7 @@
* @param showAnalysisAfterExer 瀹屾垚缁冧範鍚庢槸鍚︽樉绀虹瓟妗�
* @param canMultiExer 鏄惁鍏佽閲嶅瀛︿範
* @param needForum 鏄惁寮�閫氳鍧�
+ * @param chargeClassName 鐝富浠诲悕绉�
* @return
*/
@PostMapping(value = "update")
@@ -435,11 +436,12 @@
@RequestParam(defaultValue = "false") Boolean needQuitAudit,
@RequestParam(defaultValue = "false") Boolean showAnalysisAfterExer,
@RequestParam(defaultValue = "false") Boolean canMultiExer,
- @RequestParam(defaultValue = "false") Boolean needForum) {
+ @RequestParam(defaultValue = "false") Boolean needForum,
+ String chargeClassName) {
try {
return classService.updateClass(classId, className, classNumber, DateUtils.convertStringToDate(startTime),
DateUtils.convertStringToDate(endTime), subjectId, needJoinAudit, needQuitAudit,
- showAnalysisAfterExer, canMultiExer, needForum, teacherId);
+ showAnalysisAfterExer, canMultiExer, needForum, teacherId,chargeClassName);
} catch (ParseException e) {
log.error(e, e);
return new Result(false, "鏃ユ湡鍙傛暟閿欒");
--
Gitblit v1.8.0