派生自 projectDept/qhighschool

yn147
2022-12-07 f31a51933f86583b494fad11bb897c21a6c42db5
考勤优化
3个文件已修改
54 ■■■■■ 已修改文件
src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/controller/AttendanceController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
@@ -19,7 +19,7 @@
    /**
     *修改打卡状态
     */
    Result updateAttendanceStatus(String studentId, String attendanceStatus);
    Result updateAttendanceStatus(String[] studentId, String attendanceStatus);
    int findAttendanceListCount(String keyword, String subjectId);
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
@@ -31,31 +31,35 @@
        try{
            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
            //上课时间
            String s1 = "9:00:00";
            //如果上课时间(9点)>当前时间
            //上课时间
            String s1 = "9:00:00";
            //如果上课时间(9点)>当前时间
            String s2 = sdf.format(new Date());
            //赋值一个课程id
            stuStudent.setSubjectId(subjectId);
            //时间计算
            int compareTo = s1.compareTo(s2);
            if(compareTo>0)
            {
                s="签到时间已过,本节课按照旷课处理";
                stuStudent.setAttendanceStatus("旷课");
                s="签到时间已过,本节课按照旷课处理";
                stuStudent.setAttendanceStatus("旷课");
            }
            else
            {
                String s3 = "8:50:00";
                String s3 = "8:50:00";
                compareTo = s2.compareTo(s3);
                if(compareTo<0)
                {
                    s="未到签到时间,请与上课时间前10分钟签到";
                    stuStudent.setAttendanceStatus("未打卡");
                    s="未到签到时间,请与上课时间前10分钟签到";
                    stuStudent.setAttendanceStatus("未打卡");
                }
                else
                {
                    if(stuStudent!=null && subjectId!=null){
                        stuStudent.setSubjectId(subjectId);
                        stuStudent.setAttendanceStatus("已打卡");
                        s = "成功完成签到";
                        stuStudent.setAttendanceStatus("已打卡");
                        s = "成功完成签到";
                    }
                }
            }
@@ -82,20 +86,24 @@
    }
    @Override
    public Result updateAttendanceStatus(String studentId, String attendanceStatus) {
    public Result updateAttendanceStatus(String[] studentId, String attendanceStatus) {
        boolean pd = true;
        for (String studentIds: studentId){
        StringBuffer hql=new StringBuffer("from StuStudent where studentId=? and deleteFlag is false");
        List<Object> args = CollectionUtils.newList(studentId);
            List<Object> args = CollectionUtils.newList(studentIds);
        StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);
        if(stuStudent!=null && attendanceStatus!=null){
            stuStudent.setAttendanceStatus(attendanceStatus);
            save(stuStudent);
            return new Result(true);
                pd = true;
            }else {
                pd = false;
        }
        return new Result(false);
        }
        return new Result(pd);
    }
    @Override
src/main/java/com/qxueyou/scc/controller/AttendanceController.java
@@ -15,20 +15,20 @@
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")
    @ApiOperation(value = "打卡", notes = "")
    @GetMapping(value = "/attendanceUpAndAdd")
    public String attendanceUpAndAdd(String studentId, String subjectId) {
        return attendanceService.attendanceUpAndAdd(studentId,subjectId);
    }
    @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) {
@@ -44,9 +44,9 @@
                "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);
    }
}