From b34346ac49c1fde71b8e224555d0d8d3dd40cdf4 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 09 十二月 2022 09:50:04 +0800
Subject: [PATCH] 更新毕业
---
src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java | 1 -
src/main/java/com/qxueyou/scc/controller/AttendanceController.java | 20 ++++++++++----------
src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java | 1 -
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 5 -----
4 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java b/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
index 5607e35..a1d8300 100644
--- a/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
+++ b/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
@@ -2,7 +2,6 @@
import com.qxueyou.scc.base.model.Result;
import com.qxueyou.scc.teach.student.model.StuStudent;
-import com.qxueyou.scc.teach.subject.model.Subject;
import java.util.List;
diff --git a/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java b/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
index 8c6d084..359e926 100644
--- a/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
+++ b/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
@@ -1,17 +1,12 @@
package com.qxueyou.scc.admin.attendance.impl;
import com.qxueyou.scc.admin.attendance.AttendanceService;
-import com.qxueyou.scc.admin.classes.model.ClsClassReSubject;
import com.qxueyou.scc.base.model.Pager;
import com.qxueyou.scc.base.model.Result;
-import com.qxueyou.scc.base.service.ICommonService;
import com.qxueyou.scc.base.service.impl.CommonAppService;
import com.qxueyou.scc.base.util.CollectionUtils;
-import com.qxueyou.scc.base.util.TraceUtils;
import com.qxueyou.scc.teach.student.model.StuStudent;
import com.qxueyou.scc.teach.subject.model.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
diff --git a/src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java b/src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java
index 1bde6ee..f3bb1b1 100644
--- a/src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java
+++ b/src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java
@@ -1,6 +1,5 @@
package com.qxueyou.scc.admin.graduation.impl;
-import com.qxueyou.scc.admin.attendance.AttendanceService;
import com.qxueyou.scc.admin.graduation.GraduationService;
import com.qxueyou.scc.base.model.Result;
import com.qxueyou.scc.base.service.impl.CommonAppService;
diff --git a/src/main/java/com/qxueyou/scc/controller/AttendanceController.java b/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
index 4c4f0b2..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 = "")
+ private SubjectService subjectService;
+
+ @ApiOperation(value = "鎵撳崱", notes = "")
@GetMapping(value = "/attendanceUpAndAdd")
- public String attendanceUpAndAdd(String studentId, String subjectId) {
- return attendanceService.attendanceUpAndAdd(studentId,subjectId);
+ 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,11 +40,11 @@
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) {
return attendanceService.updateAttendanceStatus(studentId,attendanceStatus);
--
Gitblit v1.8.0