From 6beeb715fcef8db22b17c309ec8fecc45cc04b00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:30:47 +0800
Subject: [PATCH] 1.考试成绩查询修改 2.用户查询修改
---
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index 16898f0..f331ac2 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -23,6 +23,8 @@
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +44,8 @@
private final ExamPaperService examPaperService;
private final IUserService userService;
+
+ private final TrainingRegistrationService trainingRegistrationService;
/**
* 自定义分页数据
@@ -111,7 +115,7 @@
user1.setIsApply(1);
userService.updateById(user1);
}else {
- if (user1.getIsApply()==2) {
+ if (user1.getIsApply()==2 || -1==user.getIsApply() || 3==user.getIsApply()) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -288,25 +292,22 @@
//正式考试
if (apply.getApplyExamType()==1){
ApplyPaPerVO applyPaPerVO = baseMapper.getApplyInfo(apply);
- String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
- String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
- String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
- applyPaPerVO.setStringTime(time+" "+startTime.substring(0,startTime.length()-3) +"-"+ endTime.substring(0,endTime.length()-3));
+// String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
+// String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
+// String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
+ applyPaPerVO.setStringTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()));
return applyPaPerVO;
}
//模拟考试
if (apply.getApplyExamType()==2){
ApplyPaPerVO applyPaPerVO = baseMapper.getTrainApplyInfo(apply);
- String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
- String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
- String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
- applyPaPerVO.setStringTime(time+" "+startTime.substring(0,startTime.length()-3) +"-"+ endTime.substring(0,endTime.length()-3));
+// String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
+// String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
+// String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
+ applyPaPerVO.setStringTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()));
return applyPaPerVO;
}
-
-
-
return null;
}
@@ -361,13 +362,72 @@
//查询考试信息
ExamPaper paper = examPaperService.getById(apply.getExamId());
map.put("examName",paper.getExamName());
- //查询已报名的总人数
- int num = baseMapper.getApplyDeatailNum(paper.getId());
- map.put("num",num);
- //查询已报名的的人信息集合
- List<ApplyVO> applyVOList = baseMapper.getApplyDetailList(paper.getId());
- map.put("applyList",applyVOList);
+
+ int num = 0;
+ if (paper.getExamType()==1){
+ //查询已报名的总人数
+ num = baseMapper.getApplyDeatailNum(paper.getId());
+ map.put("num",num);
+ //查询已报名的的人信息集合
+ List<ApplyVO> applyVOList = baseMapper.getApplyDetailList(paper.getId());
+ map.put("applyList",applyVOList);
+ }
+
+ //模拟考试
+ if (paper.getExamType()==2){
+ //查询已报名的总人数
+ num = baseMapper.getTrainDeatailNum(paper.getId());
+ map.put("num",num);
+ //查询已报名的的人信息集合
+ List<ApplyVO> applyVOList = baseMapper.getTrainDetailList(paper.getId());
+ map.put("applyList",applyVOList);
+ }
+
//返回数据
return map;
}
+
+ /**
+ * 查询保安员个人报名信息
+ * @param apply 报名信息，包含userId
+ * @return
+ */
+ @Override
+ public ApplyVO getSecurityApplyDetail(ApplyVO apply) {
+ return baseMapper.getSecurityApplyDetail(apply);
+ }
+
+
+ /**
+ * 修改考试状态
+ * @param apply 报名信息，包含userId，applyid
+ * @return
+ */
+ @Override
+ public void updateApplyStatus(ApplyVO apply) {
+ //正式考
+ if (apply.getExamType()==1){
+ //考试中
+ apply.setIsExam(3);
+ baseMapper.updateById(apply);
+ }
+ //模拟考
+ if (apply.getExamType()==2){
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setId(apply.getId());
+ //考试中
+ trainingRegistration.setIsExam(3);
+ trainingRegistrationService.updateById(trainingRegistration);
+ }
+ }
+
+ /**
+ * 查询报名信息，取最新的一条（即当前userId,）applyId最大的一条记录
+ * @param userId
+ * @return
+ */
+ @Override
+ public Apply getMaxApplyIdByUserIdInfo(Long userId) {
+ return baseMapper.getMaxApplyIdByUserIdInfo(userId);
+ }
}
--
Gitblit v1.9.3