From 0dee81f06575d115d64adde8fc3a4ea94607f9ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 Aug 2021 11:44:17 +0800
Subject: [PATCH] 1.考试报名新增判断，同一人，同一场考试，已报名且未考试，审核通过和待审核的不能再次报名 2.考试接口修改
---
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 70 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index a5086db..9d97a0a 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -3,11 +3,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.modules.apply.entity.Apply;
+import org.springblade.modules.apply.excel.ApplyInfoExcel;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.mapper.TrainingRegistrationMapper;
import org.springblade.modules.training.service.TrainingRegistrationService;
+import org.springblade.modules.training.util.LongTimeUtil;
import org.springblade.modules.training.vo.TrainingRegistrationVo;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 报名培训服务实现类
@@ -18,7 +24,11 @@
@Override
public IPage<TrainingRegistrationVo> selectTrainingRegistrationPage(IPage<TrainingRegistrationVo> page, TrainingRegistrationVo trainingRegistration) {
- return page.setRecords(baseMapper.selectTrainingRegistrationPage(page, trainingRegistration));
+ List<TrainingRegistrationVo> trainingRegistrationVos = baseMapper.selectTrainingRegistrationPage(page, trainingRegistration);
+ trainingRegistrationVos.forEach(trainingRegistrationVo -> {
+ trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
+ });
+ return page.setRecords(trainingRegistrationVos);
}
/**
@@ -29,4 +39,62 @@
public TrainingRegistrationVo selectTrainingRegistrationInfo(TrainingRegistration trainingRegistration) {
return baseMapper.selectTrainingRegistrationInfo(trainingRegistration);
}
+
+ /**
+ * 导出报名数数据
+ * @param trainingRegistration 培训报名对象
+ * @return
+ */
+ @Override
+ public List<ApplyInfoExcel> getTrainingRegistrationExcelList(TrainingRegistrationVo trainingRegistration) {
+ return baseMapper.getTrainingRegistrationExcelList(trainingRegistration);
+ }
+
+ /**
+ * 培训考试清册导入
+ * @param data
+ * @param isCovered
+ */
+ @Override
+ public void importTrainingRegistration(List<ApplyInfoExcel> data, Boolean isCovered) {
+ data.forEach(applyInfoExcel -> {
+ //通过准考证号
+ if (null!=applyInfoExcel.getCandidateNo() && applyInfoExcel.getIdCardNo()!=""){
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setCandidateNo(applyInfoExcel.getCandidateNo());
+ //查询报名信息
+ TrainingRegistration trainingRegistration1 = baseMapper.selectOne(Condition.getQueryWrapper(trainingRegistration));
+ trainingRegistration1.setIsExam(2);
+ baseMapper.updateById(trainingRegistration1);
+ //内网新增
+ try {
+// arg.test01(arg.url+"/apply/update",apply1);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ });
+ }
+
+
+ /**
+ * 查询准考证前缀相同的数量
+ * @param result
+ * @return
+ */
+ @Override
+ public int getCandidateNoCount(String result) {
+ return baseMapper.getCandidateNoCount(result);
+ }
+
+ /**
+ * 查询培训报名信息
+ * @param trainingRegistration 培训报名对象信息
+ * @return
+ */
+ @Override
+ public Integer getTrainingRegistrationInfo(TrainingRegistration trainingRegistration) {
+ return baseMapper.getTrainingRegistrationInfo(trainingRegistration);
+ }
}
--
Gitblit v1.9.3