From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改

---
 src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java |   93 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 73 insertions(+), 20 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 effb09a..59bc92a 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,16 +3,24 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
 import org.springblade.modules.apply.entity.Apply;
 import org.springblade.modules.apply.excel.ApplyInfoExcel;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserDeptService;
+import org.springblade.modules.system.service.IUserService;
 import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.excel.TrainingRegistrationExcel;
 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 org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,14 +28,20 @@
  * @author zhongrj
  */
 @Service
+@AllArgsConstructor
 public class TrainingRegistrationServiceImpl extends ServiceImpl<TrainingRegistrationMapper, TrainingRegistration> implements TrainingRegistrationService {
+
+	private final IUserService userService;
+
+	private final IUserDeptService userDeptService;
+
 
 	@Override
 	public IPage<TrainingRegistrationVo> selectTrainingRegistrationPage(IPage<TrainingRegistrationVo> page, TrainingRegistrationVo trainingRegistration) {
 		List<TrainingRegistrationVo> trainingRegistrationVos = baseMapper.selectTrainingRegistrationPage(page, trainingRegistration);
-		trainingRegistrationVos.forEach(trainingRegistrationVo -> {
-			trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
-		});
+//		trainingRegistrationVos.forEach(trainingRegistrationVo -> {
+//			trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
+//		});
 		return page.setRecords(trainingRegistrationVos);
 	}
 
@@ -56,25 +70,45 @@
 	 * @param isCovered
 	 */
 	@Override
-	public void importTrainingRegistration(List<ApplyInfoExcel> data, Boolean isCovered) {
-		data.forEach(applyInfoExcel -> {
-			//通过准考证号
-			if (null!=applyInfoExcel.getCandidateNo() && applyInfoExcel.getIdCardNo()!=""){
+	@Transactional(rollbackFor = Exception.class)
+	public void importTrainingRegistration(List<TrainingRegistrationExcel> data, Boolean isCovered) {
+		if (data.size()>0){
+			data.forEach(trainingRegistrationExcel -> {
 				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();
-				}
-			}
+				//通过准考证号
+				if (null!=trainingRegistrationExcel.getIdCardNo() && trainingRegistrationExcel.getIdCardNo()!=""){
+					trainingRegistration.setCandidateNo(trainingRegistrationExcel.getIdCardNo());
+					User user = userService.getUserInfoByIdCardNo(trainingRegistrationExcel.getIdCardNo());
+					trainingRegistration.setUserId(user.getId().toString());
 
-		});
+					//通过培训公司查组织机构id
+					if (null!=trainingRegistrationExcel.getDeptName() && trainingRegistrationExcel.getDeptName()!=""){
+						trainingRegistration.setTrainingUnitId(userDeptService.selectIn(trainingRegistrationExcel.getDeptName()));
+					}
+					if(null==user.getIsTrain()){
+						trainingRegistration.setIsExam(1);
+						trainingRegistration.setCancel(1);
+						trainingRegistration.setTrainingTime(new Date());
+						//新增报名
+						this.save(trainingRegistration);
+						//修改保安报名状态
+						user.setIsTrain(1);
+						userService.updateById(user);
+					}else {
+						if (2 == user.getIsTrain()) {
+							trainingRegistration.setIsExam(1);
+							trainingRegistration.setCancel(1);
+							trainingRegistration.setTrainingTime(new Date());
+							//新增报名
+							this.save(trainingRegistration);
+							//修改保安报名状态
+							user.setIsTrain(1);
+							userService.updateById(user);
+						}
+					}
+				}
+			});
+		}
 	}
 
 
@@ -87,4 +121,23 @@
 	public int getCandidateNoCount(String result) {
 		return baseMapper.getCandidateNoCount(result);
 	}
+
+	/**
+	 * 查询培训报名信息
+	 * @param trainingRegistration 培训报名对象信息
+	 * @return
+	 */
+	@Override
+	public Integer getTrainingRegistrationInfo(TrainingRegistration trainingRegistration) {
+		return baseMapper.getTrainingRegistrationInfo(trainingRegistration);
+	}
+
+	/**
+	 * 查询已报名培训公司未关联考试的人员
+	 * @return
+	 */
+	@Override
+	public List<Long> getTrainIds() {
+		return baseMapper.getTrainIds();
+	}
 }

--
Gitblit v1.9.3