From 33d82860d93624e1865242be6aa752668a0c3c8d Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:47:24 +0800
Subject: [PATCH] 成绩管理bug
---
src/main/java/com/qxueyou/scc/exam/service/impl/ExamBatchService.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/exam/service/impl/ExamBatchService.java b/src/main/java/com/qxueyou/scc/exam/service/impl/ExamBatchService.java
index 117385c..f28d20f 100644
--- a/src/main/java/com/qxueyou/scc/exam/service/impl/ExamBatchService.java
+++ b/src/main/java/com/qxueyou/scc/exam/service/impl/ExamBatchService.java
@@ -16,7 +16,7 @@
import com.qxueyou.scc.exam.service.IExamBatchService;
/**
- * 试卷批次管理服务层
+ * 璇曞嵎鎵规绠＄悊鏈嶅姟灞�
*
* @author kevin
* @createTime 2017-11-1
@@ -39,24 +39,24 @@
@Override
public List<Map<String,Object>> queryListForIdName() {
// String hql="select v from ExamResultV v where v.startTime >? ";
- //根据考试获取所有批次信息
+ //鏍规嵁鑰冭瘯鑾峰彇鎵�鏈夋壒娆′俊鎭�
String hql="select r from ExamBatchInfo i , ExamBatchClassRe r where i.examId in (SELECT e.examId from ExamInfo e where e.deleteFlag is false )" +
" and i.deleteFlag is false and i.startTime>? and r.examBatchId=i.examBatchId ";
- //获取列表，开始时间大于当前时间，也就是还未开始
+ //鑾峰彇鍒楄〃锛屽紑濮嬫椂闂村ぇ浜庡綋鍓嶆椂闂达紝涔熷氨鏄繕鏈紑濮�
List<ExamBatchClassRe> examResults = this.find(hql, CollectionUtils.newList(new Date()), ExamBatchClassRe.class);
List<Map<String,Object>> list=new ArrayList<>();
for (ExamBatchClassRe examResult : examResults) {
- //封装成前端要用的数据
+ //灏佽鎴愬墠绔鐢ㄧ殑鏁版嵁
Map<String,Object> map=new HashMap<>();
- //获取考试名称加批次信息
+ //鑾峰彇鑰冭瘯鍚嶇О鍔犳壒娆′俊鎭�
String ql="SELECT e.examName from ExamInfo e where e.deleteFlag is false and e.examId=?";
- //获取考试名称
+ //鑾峰彇鑰冭瘯鍚嶇О
String s = this.findUnique(ql, CollectionUtils.newList(examResult.getExamId()), String.class);
String q="SELECT e from ExamBatchInfo e where e.deleteFlag is false and e.examBatchId=?";
- //批次信息
+ //鎵规淇℃伅
ExamBatchInfo examBatchInfo = this.findUnique(q, CollectionUtils.newList(examResult.getExamBatchId()), ExamBatchInfo.class);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- //测试考试(考场一_2020-06-16 9:00 ~ 06-16 12:00)
+ //娴嬭瘯鑰冭瘯(鑰冨満涓�_2020-06-16 9:00 ~ 06-16 12:00)
s+="("+examBatchInfo.getExamRoomName()+"_"+format.format(examBatchInfo.getStartTime())+" ~ "+new SimpleDateFormat("MM-dd HH:mm:ss").format(examBatchInfo.getEndTime())+")";
map.put("batchName",s);
map.put("batchId",examResult.getExamBatchId());
@@ -67,24 +67,24 @@
}
@Override
public List<String> queryComNameByBatchId(String classId) {
- //根据所在组id
+ //鏍规嵁鎵�鍦ㄧ粍id
String hql="select f.subjectId from StuStudent f where f.subjectId is not null and f.classId =? and f.deleteFlag is false group by f.subjectId";
- //获取公司名称列表
+ //鑾峰彇鍏徃鍚嶇О鍒楄〃
return this.find(hql, CollectionUtils.newList(classId), String.class);
}
@Override
public List<String> queryStudentNoByComNameAndBatch(String subjectId,String classId) {
- //根据所在组id
+ //鏍规嵁鎵�鍦ㄧ粍id
// String hql="select f.studentNo from StuStudent f where f.subjectId=? and f.classId =? and f.deleteFlag is false ";
String hql="select f.studentNo from StuStudent f where f.classId =? and f.deleteFlag is false ";
- //获取列表
+ //鑾峰彇鍒楄〃
// return this.find(hql, CollectionUtils.newList(subjectId,classId), String.class);
return this.find(hql, CollectionUtils.newList(classId), String.class);
}
@Override
public String addExamBatch(ExamBatchInfo examBatchInfo) {
- //查询最大批次号
+ //鏌ヨ鏈�澶ф壒娆″彿
Short maxBatchNo = this.findUnique("select max(f.examBatchNo) from ExamBatchInfo f where f.examId =? and f.deleteFlag is false", CollectionUtils.newList(examBatchInfo.getExamId()), Short.class);
maxBatchNo = maxBatchNo==null?0:maxBatchNo;
examBatchInfo.setExamBatchNo(++maxBatchNo);
@@ -120,7 +120,7 @@
examBatchInfo.setStartTime(param.getStartTime());
examBatchInfo.setEndTime(param.getEndTime());
List<ExamBatchClassRe> lstExamBatchClassRe = param.getReClasses();
- //删除原来的关联关系
+ //鍒犻櫎鍘熸潵鐨勫叧鑱斿叧绯�
String hql="update ExamBatchClassRe set deleteFlag = true where examBatchId=? ";
this.bulkUpdate(hql, new Object[]{ param.getExamBatchId()});
--
Gitblit v1.8.0