修改

yn147

2022-12-12 01c25e083932de635836697207cfe76b37ea8514

修改

 src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java

@@ -29,9 +29,9 @@
        try{
            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
            //上课时间
            String s1 = "9:00:00";
            String classTime = "9:00:00";
            //当前时间
            String s2 = sdf.format(new Date());
            String currentTime = sdf.format(new Date());
            String hqlTwo = "from Subject where name = ?";
            List<Object> argsTwo = CollectionUtils.newList(subjectName);
            Subject subject = findUnique(hqlTwo,argsTwo,Subject.class);
@@ -42,25 +42,26 @@
                stuStudent.setSubjectId(subject.getSubjectId());
            }
            //如果上课时间(9点)>当前时间
            int compareTo = s1.compareTo(s2);
            int compareTo = classTime.compareTo(currentTime);
            if(compareTo>0)
            {
                s="签到时间已过，本节课按照旷课处理";
                stuStudent.setAttendanceStatus("旷课");
                stuStudent.setAttendanceStatus(stuStudent.STATUS_TRUANCY);
            }
            else
            {
                String s3 = "8:50:00";
                compareTo = s2.compareTo(s3);
                //打卡时间
                String clockTime = "8:50:00";
                compareTo = currentTime.compareTo(clockTime);
                if(compareTo<0)
                {
                    s="未到签到时间，请与上课时间前10分钟签到";
                    stuStudent.setAttendanceStatus("未打卡");
                    stuStudent.setAttendanceStatus(stuStudent.STATUS_NO_CLOCKING);
                }
                else
                {
                    if(stuStudent!=null && subjectId!=null){
                        stuStudent.setAttendanceStatus("已打卡");
                        stuStudent.setAttendanceStatus(stuStudent.STATUS_PUNCHE);
                        s = "成功签到";
                    }
                }

 src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java

@@ -19,9 +19,9 @@

        StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);

        stuStudent.setStatus("已毕业");
        stuStudent.setStatus(stuStudent.STATUS_GRADUATED);

        if(stuStudent.getStatus() == "已毕业"){
        if(stuStudent.getStatus() == stuStudent.STATUS_GRADUATED){
            stuStudent.setGraduationText(graduationText);
        }
        save(stuStudent);

 src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java

@@ -33,6 +33,14 @@
    public static final String STATUS_REGISTER = "register";
    public static final String STATUS_ACTIVE = "active";
    public static final String STATUS_DEACTIVE = "deactive";
    public static final String STATUS_GRADUATED = "graduated";

    /**
     * 状态：旷课，未打卡，已打卡
     */
    public static final String STATUS_TRUANCY = "truancy";
    public static final String STATUS_NO_CLOCKING = "noClocking";
    public static final String STATUS_PUNCHE = "punched";

    private String studentId;
    private Date createTime;