From ddb9b1a011b26fec839618fe908dd7d1bacf4a9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 22 Oct 2021 20:02:36 +0800
Subject: [PATCH] 1.保安单位树接口修改 2.现场保安员，单位检查字段修改，接口修改 3.缴费记录接口修改 4.出资人，管理人员字段调整，接口修改，导出新增示例 5.考试中题目返回去除答案
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 129 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 118 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index db2a437..9782686 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
@@ -14,6 +15,7 @@
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.entity.ExamSubjectChoices;
import org.springblade.modules.exam.excel.ExamScoreExcel;
+import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.exam.mapper.ExamScoreMapper;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.exam.service.ExamScoreService;
@@ -29,6 +31,7 @@
import org.springblade.modules.system.vo.UserVO;
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 org.springframework.transaction.annotation.Transactional;
@@ -47,20 +50,25 @@
* @author zhongrj
*/
@Service
-@AllArgsConstructor
public class ExamScoreServiceImpl extends ServiceImpl<ExamScoreMapper, ExamScore> implements ExamScoreService {
- private final IUserService userService;
+ @Autowired
+ private IUserService userService;
- private final ExamSubjectChoicesService examSubjectChoicesService;
+ @Autowired
+ private ExamSubjectChoicesService examSubjectChoicesService;
- private final ExamPaperService examPaperService;
+ @Autowired
+ private ExamPaperService examPaperService;
- private final ApplyService applyService;
+ @Autowired
+ private ApplyService applyService;
- private final TrainingRegistrationService trainingRegistrationService;
+ @Autowired
+ private TrainingRegistrationService trainingRegistrationService;
- private final IRoleService roleService;
+ @Autowired
+ private IRoleService roleService;
/**
* 自定义分页数据
@@ -241,9 +249,19 @@
examScoreExcelList.forEach(examScoreExcel -> {
if (null!=examScoreExcel.getLearnGrade() && null!=examScoreExcel.getIdCardNo() && examScoreExcel.getIdCardNo()!=""){
//使用考试名称匹配考试信息
- ExamPaper examPaper = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
+// ExamPaper examPaper = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
//查询出成绩数据
- ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),examPaper.getId());
+// ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),examPaper.getId());
+ //根据身份证号查询用户
+ User user0 = userService.getUserInfoByIdCardNo(examScoreExcel.getIdCardNo());
+ if (null==user0){
+ throw new ServiceException("用户:["+examScoreExcel.getIdCardNo()+"]不存在");
+ }
+ ExamScore examScore1 = new ExamScore();
+ examScore1.setCandidateNo(examScoreExcel.getCandidateNo());
+ examScore1.setUserId(user0.getId().toString());
+ //根据准考证号和用户id查询考试成绩
+ ExamScore examScore = this.getOne(Condition.getQueryWrapper(examScore1));
if (null!=examScore) {
//查询当前保安信息
UserVO user = userService.getUserAgeById(Long.parseLong(examScore.getUserId()));
@@ -252,7 +270,7 @@
//合格
examScore.setQualified(0);
//正式考试通过生成保安证编号
- if (examPaper.getExamType()==1) {
+// if (examPaper.getExamType()==1) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
@@ -285,7 +303,7 @@
",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
" " +"where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
- }
+// }
} else {
//不合格
examScore.setQualified(1);
@@ -446,4 +464,93 @@
}
return true;
}
+
+
+ /**
+ * 考试重置
+ * @param updateParamVo
+ * @return
+ */
+ @Override
+ public boolean refreshTrainExamInfo(UpdateParamVo updateParamVo) {
+ if (null!=updateParamVo.getScoreId()){
+ ExamScore examScore = this.getById(updateParamVo.getScoreId());
+ //获取成绩数据，准考证号，用户id,报名培训id,考试id
+ if (null!=examScore){
+ ExamPaper paper = examPaperService.getById(examScore.getExamId());
+ //判断考试类型
+ //考试
+ if (paper.getExamType()==1){
+ //1.修改培训报名信息
+ Apply apply = new Apply();
+ apply.setId(examScore.getApplyId());
+ apply.setIsExam(1);
+ //修改
+ applyService.updateById(apply);
+
+ //2.修改用户考试状态
+ User user = new User();
+ user.setIsTrain(1);
+ user.setId(Long.parseLong(examScore.getUserId()));
+ //修改
+ userService.updateById(user);
+
+ //3.删除当前考试成绩信息
+ this.removeById(updateParamVo.getScoreId());
+
+ //4.内网数据同步
+ String s1 =
+ "update sys_apply set is_exam = " + "'" + apply.getIsExam() + "'" +
+ " " + "where id = " + "'" + apply.getId() + "';"+
+ "update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
+ " " + "where id = " + "'" + user.getId() + "';"+
+ "delete from exam_score where id = " + "'" + updateParamVo.getScoreId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+
+ return true;
+ }
+ //培训考试
+ if (paper.getExamType()==2){
+ //1.修改培训报名信息
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setId(examScore.getApplyId());
+ trainingRegistration.setIsExam(1);
+ //修改
+ trainingRegistrationService.updateById(trainingRegistration);
+
+ //2.修改用户考试状态
+ User user = new User();
+ user.setIsTrain(1);
+ user.setId(Long.parseLong(examScore.getUserId()));
+ //修改
+ userService.updateById(user);
+
+ //3.删除当前考试成绩信息
+ this.removeById(updateParamVo.getScoreId());
+
+ //4.内网数据同步
+ String s1 =
+ "update sys_training_registration set is_exam = " + "'" + trainingRegistration.getIsExam() + "'" +
+ " " + "where id = " + "'" + trainingRegistration.getId() + "';"+
+ "update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
+ " " + "where id = " + "'" + user.getId() + "';"+
+ "delete from exam_score where id = " + "'" + updateParamVo.getScoreId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 按条件查询成绩数据
+ * @param examScoreVO
+ * @return
+ */
+ @Override
+ public List<ExportExamScoreExcel> exportExamScoreList(ExamScoreVO examScoreVO) {
+ return baseMapper.getExamScoreList(examScoreVO);
+ }
}
--
Gitblit v1.9.3