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/graduation/impl/GraduationServiceImpl.java | 31 ++++++++++
src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java | 3
src/main/java/com/qxueyou/scc/admin/graduation/GraduationService.java | 12 ++++
src/main/java/com/qxueyou/scc/controller/GraduationController.java | 24 ++++++++
src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java | 13 ++++
src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java | 3
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 43 ++++++++------
7 files changed, 108 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java b/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
index 7352977..5607e35 100644
--- a/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
+++ b/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
@@ -2,6 +2,7 @@
import com.qxueyou.scc.base.model.Result;
import com.qxueyou.scc.teach.student.model.StuStudent;
+import com.qxueyou.scc.teach.subject.model.Subject;
import java.util.List;
@@ -9,7 +10,7 @@
/**
* 鎵撳崱
*/
- String attendanceUpAndAdd(String studentId,String SubjectId);
+ String attendanceUpAndAdd(String userId,String SubjectId, String subjectName);
/**
* 鏌ヨ鑰冨嫟淇℃伅
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 = "鎴愬姛绛惧埌";
}
}
}
diff --git a/src/main/java/com/qxueyou/scc/admin/graduation/GraduationService.java b/src/main/java/com/qxueyou/scc/admin/graduation/GraduationService.java
new file mode 100644
index 0000000..62c5288
--- /dev/null
+++ b/src/main/java/com/qxueyou/scc/admin/graduation/GraduationService.java
@@ -0,0 +1,12 @@
+package com.qxueyou.scc.admin.graduation;
+
+import com.qxueyou.scc.base.model.Result;
+
+public interface GraduationService {
+ /**
+ *娣诲姞淇敼姣曚笟鐘舵��
+ * @param studentIds
+ * @return
+ */
+ Result graduationAddAndUp(String[] studentIds, String graduationText);
+}
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
new file mode 100644
index 0000000..1bde6ee
--- /dev/null
+++ b/src/main/java/com/qxueyou/scc/admin/graduation/impl/GraduationServiceImpl.java
@@ -0,0 +1,31 @@
+package com.qxueyou.scc.admin.graduation.impl;
+
+import com.qxueyou.scc.admin.attendance.AttendanceService;
+import com.qxueyou.scc.admin.graduation.GraduationService;
+import com.qxueyou.scc.base.model.Result;
+import com.qxueyou.scc.base.service.impl.CommonAppService;
+import com.qxueyou.scc.base.util.CollectionUtils;
+import com.qxueyou.scc.teach.student.model.StuStudent;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class GraduationServiceImpl extends CommonAppService implements GraduationService {
+ @Override
+ public Result graduationAddAndUp(String[] studentIds, String graduationText) {
+ StringBuffer hql=new StringBuffer("from StuStudent where studentId=? and deleteFlag is false");
+
+ List<Object> args = CollectionUtils.newList(studentIds);
+
+ StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);
+
+ stuStudent.setStatus("宸叉瘯涓�");
+
+ if(stuStudent.getStatus() == "宸叉瘯涓�"){
+ stuStudent.setGraduationText(graduationText);
+ }
+ save(stuStudent);
+ return new Result(true);
+ }
+}
diff --git a/src/main/java/com/qxueyou/scc/controller/GraduationController.java b/src/main/java/com/qxueyou/scc/controller/GraduationController.java
new file mode 100644
index 0000000..1571082
--- /dev/null
+++ b/src/main/java/com/qxueyou/scc/controller/GraduationController.java
@@ -0,0 +1,24 @@
+package com.qxueyou.scc.controller;
+
+import com.qxueyou.scc.admin.graduation.GraduationService;
+import com.qxueyou.scc.base.model.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags="姣曚笟绠＄悊鎺ュ彛")
+@RestController
+@RequestMapping("/admin/Graduation")
+public class GraduationController {
+ @Autowired
+ private GraduationService graduationService;
+
+ @ApiOperation(value = "姣曚笟", notes = "")
+ @GetMapping(value = "/graduationAddAndUp")
+ public Result graduationAddAndUp(String[] studentIds, String graduationText) {
+ return graduationService.graduationAddAndUp(studentIds,graduationText);
+ }
+}
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 46262c5..cd322df 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
@@ -55,6 +55,7 @@
private BigDecimal score;
private String studentNumber;
private String attendanceStatus;
+ private String graduationText;
public StuStudent() {
}
@@ -72,7 +73,7 @@
public StuStudent(String studentId, Date createTime, Date updateTime, String creator, String createId,
String updator, String updateId, boolean deleteFlag, String userId, String name, String classId,
- String tenantId, String status, String attendanceStatus,String studentNumber) {
+ String tenantId, String status, String attendanceStatus, String graduationText,String studentNumber) {
this.studentId = studentId;
this.createTime = createTime;
this.updateTime = updateTime;
@@ -87,6 +88,7 @@
this.tenantId = tenantId;
this.status = status;
this.attendanceStatus = attendanceStatus;
+ this.graduationText = graduationText;
this.studentNumber=studentNumber;
}
@@ -224,6 +226,15 @@
this.attendanceStatus = attendanceStatus;
}
+ @Column(name = "GRADUATION_TEXT", length = 200)
+ public String getGraduationText() {
+ return this.graduationText;
+ }
+
+ public void setGraduationText(String graduationText) {
+ this.graduationText = graduationText;
+ }
+
@Column(name = "STUDENT_NO", length = 32)
public String getStudentNo() {
return studentNo;
diff --git a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
index ce8f0ed..cfb6802 100644
--- a/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
+++ b/src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java
@@ -157,7 +157,7 @@
QStuStudent qStuStudent = QStuStudent.stuStudent;
return this.getQueryFactory()
.select(qStuStudent.studentId, qStuStudent.name, qStuStudent.studentNo, qStuStudent.sex,
- qStuStudent.mobilePhone, qStuStudent.status, qStuStudent.studyDuration, qStuStudent.tenantId, qStuStudent.score,
+ qStuStudent.mobilePhone, qStuStudent.status, qStuStudent.studyDuration, qStuStudent.tenantId, qStuStudent.score, qStuStudent.graduationText,
qUser.imgPath)
.from(qUser, qStuStudent)
.where(qUser.deleteFlag.isFalse().and(qUser.userId.eq(qStuStudent.userId))
@@ -174,6 +174,7 @@
map.put("studyDuration", tuple.get(qStuStudent.studyDuration));
map.put("tenantId", tuple.get(qStuStudent.tenantId));
map.put("score", tuple.get(qStuStudent.score));
+ map.put("graduationText", tuple.get(qStuStudent.graduationText));
map.put("imgPath", tuple.get(qUser.imgPath));
return map;
}).collect(Collectors.toList());
--
Gitblit v1.8.0