From 937daff0ebc1aa16a852d5a86434ab1994d8a02d Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期一, 11 九月 2023 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/controller/AttendanceController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/AttendanceController.java b/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
index ef7cb52..257f9ca 100644
--- a/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
+++ b/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
@@ -1,34 +1,34 @@
package com.qxueyou.scc.controller;
import com.qxueyou.scc.admin.attendance.AttendanceService;
-import com.qxueyou.scc.admin.schoolRoll.ISchoolRollService;
import com.qxueyou.scc.base.model.Result;
-import com.qxueyou.scc.base.util.ClientUtils;
import com.qxueyou.scc.base.util.CollectionUtils;
import com.qxueyou.scc.base.util.QBeanUtils;
import com.qxueyou.scc.teach.student.model.StuStudent;
+import com.qxueyou.scc.teach.subject.service.impl.SubjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-@Api(tags="考勤管理接口")
+@Api(tags="鑰冨嫟绠＄悊鎺ュ彛")
@RestController
@RequestMapping("/admin/Attendance")
public class AttendanceController {
@Autowired
private AttendanceService attendanceService;
- @ApiOperation(value = "打卡", notes = "")
- @PostMapping(value = "/attendanceUpAndAdd")
- public String attendanceUpAndAdd(String studentId, String subjectId) {
- return attendanceService.attendanceUpAndAdd(studentId,subjectId);
+ private SubjectService subjectService;
+
+ @ApiOperation(value = "鎵撳崱", notes = "")
+ @GetMapping(value = "/attendanceUpAndAdd")
+ public String attendanceUpAndAdd(String userId, String subjectId, String subjectName) {
+ return attendanceService.attendanceUpAndAdd(userId,subjectId,subjectName);
}
- @ApiOperation(value = "考勤信息", notes = "")
+ @ApiOperation(value = "鑰冨嫟淇℃伅", notes = "")
@GetMapping(value = "/attendanceList")
public Result attendanceList(@RequestParam(defaultValue = "10") Integer limit, @RequestParam(defaultValue = "1") Integer pageNum, String keyword, String subjectId) {
@@ -40,13 +40,13 @@
return new Result(true,"success", CollectionUtils.newObjectMap("attendanceList",
QBeanUtils.listBean2ListMap(attendanceList,
CollectionUtils.newStringMap("name", "studentName", "studentNo", "studentNo","sex","sex","mobilePhone","mobilePhone", "attendanceStatus",
- "attendanceStatus", "createTime", "createTime")),
+ "attendanceStatus", "createTime", "createTime", "studentId", "studentId")),
"attendanceCount", count));
}
- @ApiOperation(value = "修改考勤状态", notes = "")
+ @ApiOperation(value = "淇敼鑰冨嫟鐘舵��", notes = "")
@GetMapping(value = "/updateAttendanceStatus")
- public Result updateAttendanceStatus(String studentId, String attendanceStatus) {
+ public Result updateAttendanceStatus(String[] studentId, String attendanceStatus) {
return attendanceService.updateAttendanceStatus(studentId,attendanceStatus);
}
}
--
Gitblit v1.8.0