From e79852be186f01b930c1dd4a51a07b5c6b45274c Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 09 十二月 2022 09:45:15 +0800
Subject: [PATCH] 毕业登记
---
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 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 114f184..8c6d084 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,6 +1,7 @@
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;
@@ -8,6 +9,7 @@
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;
@@ -20,46 +22,51 @@
public class AttendanceServiceImpl extends CommonAppService implements AttendanceService {
@Override
- public String attendanceUpAndAdd(String studentId, String subjectId) {
+ public String attendanceUpAndAdd(String userId, String subjectId, String subjectName) {
String s="";
- StringBuffer hql=new StringBuffer("from StuStudent where studentId=? and deleteFlag is false");
+ StringBuffer hql=new StringBuffer("from StuStudent where userId=? and deleteFlag is false");
- List<Object> args = CollectionUtils.newList(studentId);
+ List<Object> args = CollectionUtils.newList(userId);
StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);
try{
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
- //上课时间
- String s1 = "9：00:00";
- //如果上课时间(9点)>当前时间
+ //涓婅鏃堕棿
+ String s1 = "9:00:00";
+ //褰撳墠鏃堕棿
String s2 = sdf.format(new Date());
-
- //赋值一个课程id
- stuStudent.setSubjectId(subjectId);
-
- //时间计算
+ String hqlTwo = "from Subject where name = ?";
+ List<Object> argsTwo = CollectionUtils.newList(subjectName);
+ Subject subject = findUnique(hqlTwo,argsTwo,Subject.class);
+ //娣诲姞subjectId
+ if(subject.getSubjectId() == subjectId){
+ stuStudent.setSubjectId(subjectId);
+ }else {
+ stuStudent.setSubjectId(subject.getSubjectId());
+ }
+ //濡傛灉涓婅鏃堕棿(9鐐�)>褰撳墠鏃堕棿
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.setAttendanceStatus("已打卡");
- s = "成功完成签到";
+ stuStudent.setAttendanceStatus("宸叉墦鍗�");
+ s = "鎴愬姛绛惧埌";
}
}
}
--
Gitblit v1.8.0