From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.java b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.java
index 47bc2a3..884e590 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.java
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.absentrecords.entity.AbsentRecords;
import org.springblade.modules.apply.excel.ApplyInfoExcel;
import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.excel.TrainingRegistrationExcel;
import org.springblade.modules.training.vo.TrainingRegistrationVo;
import java.util.List;
@@ -37,7 +39,7 @@
* @param trainingRegistration 培训报名对象
* @return
*/
- List<ApplyInfoExcel> getTrainingRegistrationExcelList(@Param("trainingRegistration")TrainingRegistrationVo trainingRegistration);
+ List<TrainingRegistrationExcel> getTrainingRegistrationExcelList(@Param("trainingRegistration")TrainingRegistrationVo trainingRegistration);
/**
* 查询准考证前缀相同的数量
@@ -57,5 +59,13 @@
* 查询已报名培训公司未关联考试的人员
* @return
*/
- List<Long> getTrainIds();
+ List<TrainingRegistration> getTrainIds(@Param("trainingRegistration") TrainingRegistrationVo trainingRegistration);
+
+ /**
+ * 查询考试申请审核通过，已报名，未考试的人员
+ * @param trainingRegistration
+ * @return
+ */
+ List<TrainingRegistration> selectTrainingRegistrationList(@Param("trainingRegistration") TrainingRegistration trainingRegistration);
+
}
--
Gitblit v1.9.3