From b0625931bc528429d592f642bdd759e7dbdfb1c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 19 Oct 2021 22:21:07 +0800
Subject: [PATCH] 1.保安员新增接口修改，单个新增保安员默认密码为身份证号后6位，账号为身份证号， 2.考试成绩可以按天导出 3.个人图片批量导入接口修改 4.保安员批量导入修改，如有重复的账号导入的跳过，导入完成后返回提示信息
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 103 insertions(+), 7 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..cc973d8 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
@@ -14,6 +14,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 +30,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 +49,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;
/**
* 自定义分页数据
@@ -446,4 +453,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