From 6ca7ca9feb1cc4a35cab3a3af8dddfae2580bddc Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 08 十二月 2022 14:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 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 7d6ce60..114f184 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
@@ -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) {
- StringBuffer hql=new StringBuffer("from StuStudent where studentId=? and deleteFlag is false");
+ 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);
+ StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);
- if(stuStudent!=null && attendanceStatus!=null){
- stuStudent.setAttendanceStatus(attendanceStatus);
- save(stuStudent);
- return new Result(true);
+ if(stuStudent!=null && attendanceStatus!=null){
+ stuStudent.setAttendanceStatus(attendanceStatus);
+ save(stuStudent);
+ pd = true;
+ }else {
+ pd = false;
+ }
}
-
- return new Result(false);
+ return new Result(pd);
}
@Override
--
Gitblit v1.8.0