From 26780c533f2c2af6b9216306f649c1bcede94e4a Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 24 十一月 2023 16:43:37 +0800
Subject: [PATCH] 学生、课程
---
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 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 8c6d084..f78e29a 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
@@ -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;
@@ -32,40 +27,41 @@
StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);
try{
- SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
- //涓婅鏃堕棿
- String s1 = "9:00:00";
- //褰撳墠鏃堕棿
- String s2 = sdf.format(new Date());
String hqlTwo = "from Subject where name = ?";
List<Object> argsTwo = CollectionUtils.newList(subjectName);
Subject subject = findUnique(hqlTwo,argsTwo,Subject.class);
+ //缁撴潫鏃堕棿
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String classTime = sdf.format(subject.getEndTime());
+ //褰撳墠鏃堕棿
+ String currentTime = sdf.format(new Date());
//娣诲姞subjectId
if(subject.getSubjectId() == subjectId){
stuStudent.setSubjectId(subjectId);
}else {
stuStudent.setSubjectId(subject.getSubjectId());
}
- //濡傛灉涓婅鏃堕棿(9鐐�)>褰撳墠鏃堕棿
- int compareTo = s1.compareTo(s2);
+ //缁撴潫鏃堕棿 >褰撳墠鏃堕棿
+ int compareTo = classTime.compareTo(currentTime);
if(compareTo>0)
{
- s="绛惧埌鏃堕棿宸茶繃锛屾湰鑺傝鎸夌収鏃疯澶勭悊";
- stuStudent.setAttendanceStatus("鏃疯");
+ s="绛惧埌鏃堕棿宸茶繃";
+ stuStudent.setAttendanceStatus(stuStudent.STATUS_TRUANCY);
}
else
{
- String s3 = "8:50:00";
- compareTo = s2.compareTo(s3);
+ //鎵撳崱鏃堕棿
+ String clockTime = sdf.format(subject.getStartTime());
+ compareTo = currentTime.compareTo(clockTime);
if(compareTo<0)
{
- s="鏈埌绛惧埌鏃堕棿锛岃涓庝笂璇炬椂闂村墠10鍒嗛挓绛惧埌";
- stuStudent.setAttendanceStatus("鏈墦鍗�");
+ s="鏈埌绛惧埌鏃堕棿";
+ stuStudent.setAttendanceStatus(stuStudent.STATUS_NO_CLOCKING);
}
else
{
if(stuStudent!=null && subjectId!=null){
- stuStudent.setAttendanceStatus("宸叉墦鍗�");
+ stuStudent.setAttendanceStatus(stuStudent.STATUS_PUNCHE);
s = "鎴愬姛绛惧埌";
}
}
@@ -80,10 +76,10 @@
}
@Override
- public List<StuStudent> findAttendanceList(Integer limit, Integer pageNum, String keyword, String subjectId) {
- StringBuffer hql=new StringBuffer("from StuStudent where name like ? and subjectId = ? and deleteFlag is false");
+ public List<StuStudent> findAttendanceList(Integer limit, Integer pageNum, String keyword, String classId) {
+ StringBuffer hql=new StringBuffer("from StuStudent where name like ? and classId = ? and deleteFlag is false");
- List<Object> args = CollectionUtils.newList(keyword + "%",subjectId);
+ List<Object> args = CollectionUtils.newList(keyword + "%",classId);
hql.append(" order by createTime desc");
--
Gitblit v1.8.0