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/admin/score/action/ScoreController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/score/action/ScoreController.java b/src/main/java/com/qxueyou/scc/admin/score/action/ScoreController.java
index c7821fd..3e02b20 100644
--- a/src/main/java/com/qxueyou/scc/admin/score/action/ScoreController.java
+++ b/src/main/java/com/qxueyou/scc/admin/score/action/ScoreController.java
@@ -30,13 +30,13 @@
import java.util.List;
import java.util.Map;
-@Api(tags = "成绩管理接口")
+@Api(tags = "鎴愮哗绠＄悊鎺ュ彛")
@Controller
@CrossOrigin(origins="*",maxAge=3600)
@RequestMapping(value = "admin/score")
public class ScoreController {
- // 分页查询中，默认记录条数和页数
+ // 鍒嗛〉鏌ヨ涓紝榛樿璁板綍鏉℃暟鍜岄〉鏁�
private static final int DEFAULT_PAGE_SIZE = 10;
private static final int DEFAULT_PAGE_NUM = 1;
@@ -56,21 +56,21 @@
pageNum = pageNum != null && pageNum > 0 ? pageNum : DEFAULT_PAGE_NUM;
Pager pager = new Pager(pageSize,pageNum);
if(classId == null){
- classId = "%";
+ classId = "";
}else {
classId += "%";
}
List<Map<String,Object>> mapList = new ArrayList<>();
List<ExamResultV> examResultVS = scoreService.allExamResultV(classId);
List<ExerciseResultV> exerciseResultVS = scoreService.allExerciseResultV(classId);
- //总成绩数量
+ //鎬绘垚缁╂暟閲�
int totalCount = scoreService.findCount("from ExamResultV where class_Id Like ? and score != null and score != 0",CollectionUtils.newList(classId));
if (examResultVS.size() < exerciseResultVS.size()){
totalCount = exerciseResultVS.size();
}
int totalPage = totalCount % pageSize > 0 ? totalCount/pageSize + 1 : totalCount/pageSize;
int currentPage = pageNum < totalPage? pageNum : totalPage;
- int pageStart = (currentPage-1) * pageSize;
+ int pageStart = (currentPage-1) * pageSize < 0 ? 0 : (currentPage-1) * pageSize;
int pageEnd = pageSize * currentPage > totalCount ? totalCount : pageSize * currentPage;
pager.setTotalCount(totalCount);
--
Gitblit v1.8.0