From 29e064a60b78ae87d0479159089ffeb27f43833c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 19 Jan 2022 13:32:47 +0800
Subject: [PATCH] 新增考试查询统计

---
 src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java |   45 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
index 20acbd3..e21024e 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
@@ -18,20 +18,19 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.utils.TimeSwitchUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.modules.apply.entity.Apply;
 import org.springblade.modules.exam.entity.*;
 import org.springblade.modules.exam.mapper.ExamPaperMapper;
 import org.springblade.modules.exam.service.*;
-import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
-import org.springblade.modules.exam.vo.ExamPaperVO;
-import org.springblade.modules.exam.vo.ExamScoreVO;
-import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
+import org.springblade.modules.exam.vo.*;
 import org.springblade.modules.training.entity.TrainingRegistration;
 import org.springblade.modules.training.service.TrainingRegistrationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -80,6 +79,22 @@
 			//模拟考试
 			if (examPaperVO1.getExamType()==2) {
 				examPaperVO1.setNum(baseMapper.getTrainNumber(examPaperVO1));
+				examPaperVO1.setExamNum(baseMapper.getExamNumber(examPaperVO1));
+				//计算截止时间
+				long nowTime = System.currentTimeMillis();
+				long examStartTime = examPaperVO1.getStartTime().getTime();
+				long examEndTime = examPaperVO1.getEndTime().getTime();
+				//判断时间
+				if (nowTime-examEndTime>0){
+					//剩余时间大于1天
+					examPaperVO1.setDeadline("考试已结束");
+				}else if(nowTime-examStartTime>=0 && nowTime-examEndTime<=0){
+					//已到考试时间
+					examPaperVO1.setDeadline("已到考试时间");
+				}else {
+					long time = examStartTime - nowTime;
+					examPaperVO1.setDeadline(TimeSwitchUtil.secondToTime(time));
+				}
 			}
 		});
 		return examPaperVOIPage;
@@ -108,6 +123,8 @@
 				//新增
 //				examExaminationSubjectService.save(ksxtSginup);
 				list.add(ksxtSginup);
+				//将题目答案设置为空字符串,不让前端看到
+				examSubjectChoicesVO.setAnswer("");
 			});
 			//批量新增
 			baseMapper.insertBatch(list);
@@ -144,13 +161,13 @@
 
 	/**
 	 * 查询考生考试信息
-	 * @param userId 用户id
+	 * @param examPaper 用户id
 	 * @return
 	 */
 	@Override
-	public List<ExamPaperVO> getExamDetail(String userId) {
+	public List<ExamPaperVO> getExamDetail(ExamPaperVO examPaper) {
 		//查询考试信息
-		return baseMapper.getExamDetail(userId);
+		return baseMapper.getExamDetail(examPaper);
 	}
 
 	/**
@@ -179,7 +196,7 @@
 	 * @return
 	 */
 	@Override
-	public ExamPaper getExamInfoByExamName(String examName) {
+	public List<ExamPaper> getExamInfoByExamName(String examName) {
 		return baseMapper.getExamInfoByExamName(examName);
 	}
 
@@ -239,4 +256,16 @@
 		}
 		return null;
 	}
+
+
+	/**
+	 * 查询考试统计信息
+	 * @param examPaperVO
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public IPage<ExamStatisticsVO> getExamStatistics(IPage<ExamStatisticsVO> page, ExamPaperVO examPaperVO) {
+		return page.setRecords(baseMapper.getExamStatistics(page,examPaperVO));
+	}
 }

--
Gitblit v1.9.3