From 01c25e083932de635836697207cfe76b37ea8514 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期一, 12 十二月 2022 11:23:14 +0800
Subject: [PATCH] 修改
---
src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java | 4 ++--
src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java | 8 ++++++++
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 17 +++++++++--------
3 files changed, 19 insertions(+), 10 deletions(-)
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 359e926..bd39dae 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
@@ -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 = "鎴愬姛绛惧埌";
}
}
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 f3bb1b1..afaddcd 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
@@ -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);
diff --git a/src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java b/src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java
index cd322df..690e1f4 100644
--- a/src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java
+++ b/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;
--
Gitblit v1.8.0