From 0e62c15e4b010ffa2d5cff9474f3fd389e369338 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 24 十一月 2023 14:31:46 +0800
Subject: [PATCH] 优化作业、考试、试卷、题库
---
src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java b/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java
index df4dcb0..65c0a84 100644
--- a/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java
+++ b/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java
@@ -62,9 +62,13 @@
@Override
public List<ExamInfo> list(String keyword,String classId,String subjectId,Short status, Integer pageSize,Integer pageNum) {
StringBuffer hql = new StringBuffer(500);
- hql.append("from ExamInfo e where e.examName like ? and e.createId=? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
-
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+ hql.append("from ExamInfo e where e.examName like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and e.createId=?");
+ params.add(teacherId);
+ }
if(status!=null){
hql.append(" and e.examStatus = ? ");
params.add(status);
@@ -87,9 +91,13 @@
@Override
public int listCount(String keyword,String classId,String subjectId,Short status) {
StringBuffer hql = new StringBuffer(500);
- hql.append("from ExamInfo e where e.examName like ? and e.createId=? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
-
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+ hql.append("from ExamInfo e where e.examName like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and e.createId=?");
+ params.add(teacherId);
+ }
if(status!=null){
hql.append(" and e.examStatus = ? ");
params.add(status);
@@ -567,11 +575,11 @@
// 濡傛灉宸叉彁浜ゅ氨鏌ヨ鐢ㄦ埛绛旀淇℃伅
//TODO 鏆傛椂涓嶅彲浠ユ煡鐪嬭�冭瘯绛旀锛屽凡鎻愪氦灏变笉鍙互杩涘叆
- if (Integer.valueOf(record.getStatus())> 0) {
- resultData.put("studentScore", record.getScore());
- resultData.put("objStudentScore", record.getObjScore()==null?BigDecimal.ZERO:record.getObjScore());
- return new Result(false,"鑰冭瘯宸叉彁浜�");
- }
+// if (Integer.valueOf(record.getStatus())> 0) {
+// resultData.put("studentScore", record.getScore());
+// resultData.put("objStudentScore", record.getObjScore()==null?BigDecimal.ZERO:record.getObjScore());
+// return new Result(false,"鑰冭瘯宸叉彁浜�");
+// }
//鑾峰彇鑰冭瘯
String ql="select i from ExamInfo i , ExamBatchClassRe r where i.deleteFlag is false and r.examBatchId=? and r.examId=i.examId";
ExamInfo exam = this.findUnique(ql, CollectionUtils.newList(examBatchId), ExamInfo.class);
--
Gitblit v1.8.0