派生自 projectDept/qhighschool

yn147
2022-12-09 b34346ac49c1fde71b8e224555d0d8d3dd40cdf4
更新毕业
4个文件已修改
27 ■■■■■ 已修改文件
src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/controller/AttendanceController.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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;
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;
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);