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/training/service/TrainingRegistrationService.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/service/TrainingRegistrationService.java b/src/main/java/org/springblade/modules/training/service/TrainingRegistrationService.java
index 43c0424..4c9b723 100644
--- a/src/main/java/org/springblade/modules/training/service/TrainingRegistrationService.java
+++ b/src/main/java/org/springblade/modules/training/service/TrainingRegistrationService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 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;
@@ -40,7 +41,7 @@
 	 * @param data
 	 * @param isCovered
 	 */
-	void importTrainingRegistration(List<ApplyInfoExcel> data, Boolean isCovered);
+	void importTrainingRegistration(List<TrainingRegistrationExcel> data, Boolean isCovered,Long examId);
 
 	/**
 	 * 查询准考证前缀相同的数量
@@ -48,4 +49,17 @@
 	 * @return
 	 */
 	int getCandidateNoCount(String result);
+
+	/**
+	 * 查询培训报名信息
+	 * @param trainingRegistration 培训报名对象信息
+	 * @return
+	 */
+	Integer getTrainingRegistrationInfo(TrainingRegistration trainingRegistration);
+
+	/**
+	 * 查询已报名培训公司未关联考试的人员
+	 * @return
+	 */
+    List<TrainingRegistration> getTrainIds(TrainingRegistrationVo trainingRegistrationVo);
 }

--
Gitblit v1.9.3