From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 167 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 146 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index 16898f0..a03c112 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -1,6 +1,7 @@
package org.springblade.modules.apply.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
@@ -12,6 +13,8 @@
import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
+import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.FTP.OutJson;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyInfoExcel;
@@ -20,15 +23,24 @@
import org.springblade.modules.apply.vo.ApplyPaPerVO;
import org.springblade.modules.apply.vo.ApplyVO;
import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.service.ExamPaperService;
+import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+
+import static org.springblade.common.constant.FtpConstant.*;
/**
* 考试报名服务实现类
@@ -43,6 +55,8 @@
private final IUserService userService;
+ private final TrainingRegistrationService trainingRegistrationService;
+
/**
* 自定义分页数据
* @param page 分页条件
@@ -51,6 +65,11 @@
*/
@Override
public IPage<ApplyVO> selectApplyPage(IPage<ApplyVO> page, ApplyVO apply) {
+ if (null!=apply.getApplyStatus()){
+ if(apply.getApplyStatus()==3){
+ return page.setRecords(baseMapper.selectApplyPageStatis(page,apply));
+ }
+ }
return page.setRecords(baseMapper.selectApplyPage(page, apply));
}
@@ -91,7 +110,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importApply(List<ApplyExcel> data, Boolean isCovered) {
+ public void importApply(List<ApplyExcel> data, Boolean isCovered,Long examId) {
data.forEach(applyExcel -> {
//查询用户信息
User user = new User();
@@ -106,22 +125,60 @@
apply1.setIsExam(1);
apply1.setApplyTime(new Date());
apply1.setUserId(user1.getId());
+ if (null!=examId){
+ apply1.setExamId(examId);
+ //生成准考证号
+ apply1.setCandidateNo(getCandidateNo(apply1));
+ }
+
this.save(apply1);
//修改保安报名状态
user1.setIsApply(1);
userService.updateById(user1);
+
+ String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ Long id = apply1.getId();
+ String s = "insert into sys_apply(id,user_id,candidate_no,apply_time,apply_status,exam_id,is_exam) " +
+ "values(" + "'" + id + "'" + ","
+ + "'" + apply1.getUserId() + "'" + ","
+ + "'" + apply1.getCandidateNo() + "'" + ","
+ + "'" + formatStr +"'" + ","
+ + "'" + apply1.getApplyStatus() + "'" + ","
+ + "'" + examId + "'" + ","
+ +"'" + apply1.getIsExam() + "'" + ");" +
+ "update blade_user set is_apply = " + "'" + user1.getIsApply() + "'" +"where id = " + "'" + user1.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
}else {
- if (user1.getIsApply()==2) {
+ if (user1.getIsApply()!=1) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
apply1.setIsExam(1);
apply1.setApplyTime(new Date());
apply1.setUserId(user1.getId());
+ if (null!=examId){
+ apply1.setExamId(examId);
+ //生成准考证号
+ apply1.setCandidateNo(getCandidateNo(apply1));
+ }
this.save(apply1);
//修改保安报名状态
user1.setIsApply(1);
userService.updateById(user1);
+
+ //内网数据同步
+ String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ Long id = apply1.getId();
+ String s = "insert into sys_apply(id,user_id,candidate_no,apply_time,apply_status,exam_id,is_exam) " +
+ "values(" + "'" + id + "'" + ","
+ + "'" + apply1.getUserId() + "'" + ","
+ + "'" + apply1.getCandidateNo() + "'" + ","
+ + "'" + formatStr +"'" + ","
+ + "'" + apply1.getApplyStatus() + "'" + ","
+ + "'" + examId + "'" + ","
+ +"'" + apply1.getIsExam() + "'" + ");" +
+ "update blade_user set is_apply = " + "'" + user1.getIsApply() + "'" +"where id = " + "'" + user1.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
}
}
}
@@ -288,25 +345,22 @@
//正式考试
if (apply.getApplyExamType()==1){
ApplyPaPerVO applyPaPerVO = baseMapper.getApplyInfo(apply);
- String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
- String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
- String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
- applyPaPerVO.setStringTime(time+" "+startTime.substring(0,startTime.length()-3) +"-"+ endTime.substring(0,endTime.length()-3));
+// String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
+// String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
+// String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
+ applyPaPerVO.setStringTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()));
return applyPaPerVO;
}
//模拟考试
if (apply.getApplyExamType()==2){
ApplyPaPerVO applyPaPerVO = baseMapper.getTrainApplyInfo(apply);
- String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
- String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
- String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
- applyPaPerVO.setStringTime(time+" "+startTime.substring(0,startTime.length()-3) +"-"+ endTime.substring(0,endTime.length()-3));
+// String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
+// String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
+// String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
+ applyPaPerVO.setStringTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()));
return applyPaPerVO;
}
-
-
-
return null;
}
@@ -345,8 +399,10 @@
* @return
*/
@Override
- public List<Long> getApplyIds() {
- return baseMapper.getApplyIds();
+ public List<Apply> getApplyIds(ApplyVO applyVO) {
+ applyVO.setSerialStart(applyVO.getSerialStart() -1);
+ applyVO.setSerialEnd(applyVO.getSerialEnd() -applyVO.getSerialStart());
+ return baseMapper.getApplyIds(applyVO);
}
/**
@@ -361,13 +417,82 @@
//查询考试信息
ExamPaper paper = examPaperService.getById(apply.getExamId());
map.put("examName",paper.getExamName());
- //查询已报名的总人数
- int num = baseMapper.getApplyDeatailNum(paper.getId());
- map.put("num",num);
- //查询已报名的的人信息集合
- List<ApplyVO> applyVOList = baseMapper.getApplyDetailList(paper.getId());
- map.put("applyList",applyVOList);
+
+ int num = 0;
+ if (paper.getExamType()==1){
+ //查询已报名的总人数
+ num = baseMapper.getApplyDeatailNum(paper.getId());
+ map.put("num",num);
+ //查询已报名的的人信息集合
+ List<ApplyVO> applyVOList = baseMapper.getApplyDetailList(paper.getId());
+ map.put("applyList",applyVOList);
+ }
+
+ //模拟考试
+ if (paper.getExamType()==2){
+ //查询已报名的总人数
+ num = baseMapper.getTrainDeatailNum(paper.getId());
+ map.put("num",num);
+ //查询已报名的的人信息集合
+ List<ApplyVO> applyVOList = baseMapper.getTrainDetailList(paper.getId());
+ map.put("applyList",applyVOList);
+ }
+
//返回数据
return map;
}
+
+ /**
+ * 查询保安员个人报名信息
+ * @param apply 报名信息，包含userId
+ * @return
+ */
+ @Override
+ public ApplyVO getSecurityApplyDetail(ApplyVO apply) {
+ return baseMapper.getSecurityApplyDetail(apply);
+ }
+
+
+ /**
+ * 修改考试状态
+ * @param apply 报名信息，包含userId，applyid
+ * @return
+ */
+ @Override
+ public void updateApplyStatus(ApplyVO apply) {
+ //正式考
+ if (apply.getExamType()==1){
+ Apply apply1 = new Apply();
+ apply1.setId(apply.getId());
+ //考试中
+ apply1.setIsExam(3);
+ baseMapper.updateById(apply1);
+
+// String s1 =
+// "update sys_apply set is_exam = " + apply1.getIsExam() + " " +"where id = " + "'" + apply1.getId() + "'";
+// FtpUtil.sqlFileUpload(s1);
+ }
+ //模拟考
+ if (apply.getExamType()==2){
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setId(apply.getId());
+ //考试中
+ trainingRegistration.setIsExam(3);
+ trainingRegistrationService.updateById(trainingRegistration);
+
+// String s1 =
+// "update sys_training_registration set is_exam = " + trainingRegistration.getIsExam() + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
+// FtpUtil.sqlFileUpload(s1);
+ }
+ }
+
+ /**
+ * 查询报名信息，取最新的一条（即当前userId,）applyId最大的一条记录
+ * @param userId
+ * @return
+ */
+ @Override
+ public Apply getMaxApplyIdByUserIdInfo(Long userId) {
+ return baseMapper.getMaxApplyIdByUserIdInfo(userId);
+ }
}
--
Gitblit v1.9.3