From df054296327ebca617a9c19bb01139b9c40bf232 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Jun 2022 11:25:44 +0800
Subject: [PATCH] 培训报名，保安员头像导入新增修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 693 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 521 insertions(+), 172 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 2a3789f..e166706 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -1,5 +1,6 @@
package org.springblade.modules.training.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -9,38 +10,44 @@
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-import org.springblade.common.utils.arg;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.common.constant.AgeUtil;
+import org.springblade.common.utils.FtpSyncUtil;
import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.FTP.Monitor;
+import org.springblade.modules.FTP.Result;
import org.springblade.modules.apply.entity.Apply;
-import org.springblade.modules.apply.excel.ApplyImporter;
-import org.springblade.modules.apply.excel.ApplyInfoExcel;
-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.excel.ExamScoreExcel;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
-import org.springblade.modules.training.entity.TrainExam;
+import org.springblade.modules.system.service.MyAsyncService;
+import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.excel.TrainingRegistrationExcel;
import org.springblade.modules.training.excel.TrainingRegistrationImporter;
-import org.springblade.modules.training.service.TrainExamService;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springblade.modules.training.vo.TrainingRegistrationVo;
+import org.springblade.modules.vip.service.UserVipService;
+import org.springblade.modules.vip.service.VipTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
-import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author zhongrj
@@ -57,6 +64,14 @@
private final IUserService userService;
private final ExamPaperService examPaperService;
+
+ private final UserVipService userVipService;
+
+ private final VipTopicService vipTopicService;
+ private final MyAsyncService myAsyncService;
+
+ private final RedisTemplate redisTemplate;
+
/**
* 自定义分页
@@ -77,12 +92,14 @@
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
public R save(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
if (null==user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
//默认为未考试状态
trainingRegistration.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration.setAuditStatus(4);
trainingRegistration.setTrainingTime(new Date());
//报名
trainingRegistrationService.save(trainingRegistration);
@@ -105,6 +122,8 @@
trainingRegistration.setCancel(1);
//默认为未考试状态
trainingRegistration.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration.setAuditStatus(4);
trainingRegistration.setTrainingTime(new Date());
//报名
trainingRegistrationService.save(trainingRegistration);
@@ -126,18 +145,38 @@
/**
* 报名
*/
- private void saveTrainingRegistration(TrainingRegistration trainingRegistration,User user1){
+ private StringBuilder batchSaveTrainingRegistration(TrainingRegistration trainingRegistration,User user1,StringBuilder builder){
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = trainingRegistration.getId();
- String s = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam) " +
+ String sql = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam,audit_status) " +
"values(" + "'" + id + "'"
+ "," + "'" + trainingRegistration.getTrainingUnitId() +"'"
+ "," + "'" + formatStr +"'"
+ "," + "'" + trainingRegistration.getCancel() + "'"
+ "," + "'" + trainingRegistration.getUserId() + "'"
- + "," +"'" + trainingRegistration.getIsExam() + "'" + ");" +
+ + "," + "'" + trainingRegistration.getIsExam() + "'"
+ + "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
"update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ return FtpSyncUtil.sqlHandler(builder, sql,500);
+ }
+
+ /**
+ * 报名
+ */
+ private void saveTrainingRegistration(TrainingRegistration trainingRegistration,User user1){
+ String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ Long id = trainingRegistration.getId();
+ String sql = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam,audit_status) " +
+ "values(" + "'" + id + "'"
+ + "," + "'" + trainingRegistration.getTrainingUnitId() +"'"
+ + "," + "'" + formatStr +"'"
+ + "," + "'" + trainingRegistration.getCancel() + "'"
+ + "," + "'" + trainingRegistration.getUserId() + "'"
+ + "," + "'" + trainingRegistration.getIsExam() + "'"
+ + "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
+ "update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
+ //FtpUtil.sqlFileUpload(sql);
+ myAsyncService.FTP(sql);
}
@@ -148,7 +187,8 @@
@PostMapping("/cancelTrain")
public R cancelApply(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
+
if(null==user.getIsTrain()){
trainingRegistration.setCancel(2);
boolean status = trainingRegistrationService.updateById(trainingRegistration);
@@ -176,8 +216,76 @@
if (status){
return R.data(200,"取消报名成功");
}
+ }else {
+ return R.data(201,"尚未报名");
+ }
+ }
+ return R.data(202,"取消报名失败");
+ }
+ /**
+ * 审核通过
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/auditSucess")
+ public R auditSucess(@RequestBody TrainingRegistration trainingRegistration){
+ //查询人员信息
+ User user = userService.getUserById(trainingRegistration.getUserId());
+ boolean status = false;
+ if (null!=user){
+ //修改为已报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ trainingRegistration.setAuditStatus(1);
+ trainingRegistration.setCancel(1);
+ status = trainingRegistrationService.updateById(trainingRegistration);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+ }
+ return R.data(status);
+ }
+
+
+ /**
+ * 取消报名,并设置为审核不通过
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/cancelTrainAudit")
+ public R cancelApplyAudit(@RequestBody TrainingRegistration trainingRegistration){
+ //查询人员是否已报名
+ User user = userService.getUserById(trainingRegistration.getUserId());
+ if(null==user.getIsTrain()){
+ trainingRegistration.setCancel(2);
+ trainingRegistration.setAuditStatus(2);
+ boolean status = trainingRegistrationService.updateById(trainingRegistration);
+ //修改保安报名状态
+ user.setIsTrain(2);
+ userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }else {
+ if(user.getIsTrain()==1){
+ trainingRegistration.setCancel(2);
+ trainingRegistration.setAuditStatus(2);
+ boolean status = trainingRegistrationService.updateById(trainingRegistration);
+ //修改保安报名状态
+ user.setIsTrain(2);
+ userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
}else {
return R.data(201,"尚未报名");
@@ -193,9 +301,12 @@
*/
private void cancelTrainingRegistrationSync(TrainingRegistration trainingRegistration,User user){
String s =
- "update sys_training_registration set cancel = " + trainingRegistration.getCancel() + " " +"where id = " + "'" + trainingRegistration.getId() + "';" +
+ "update sys_training_registration set cancel = " + trainingRegistration.getCancel() +
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'" +
+ " " +"where id = " + "'" + trainingRegistration.getId() + "';" +
"update blade_user set is_train = " + user.getIsTrain() + " " +"where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
}
/**
@@ -205,30 +316,78 @@
@PostMapping("/batchTrain")
public R batchApply(@RequestBody TrainingRegistrationVo trainingRegistration){
List<String> list = Arrays.asList(trainingRegistration.getUserIds().split(","));
- list.forEach(userId ->{
- User user = userService.getById(userId);
- //未报名的新增，已报名的不做处理
- if (null==user.getIsTrain()) {
- TrainingRegistration trainingRegistration1 = new TrainingRegistration();
- trainingRegistration1.setCancel(1);
- //默认为未考试状态
- trainingRegistration1.setIsExam(1);
- trainingRegistration1.setTrainingTime(new Date());
- trainingRegistration1.setUserId(userId);
- trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
- trainingRegistrationService.save(trainingRegistration1);
- //修改保安报名状态
- user.setIsTrain(1);
- userService.updateById(user);
+ //将集合推送内网，判断年龄是否符合要求，得到返回的结果，结果需包含userId，及年龄是否符合的状态
+ //生成随机数
+ String uuid = UUID.randomUUID().toString();
+ //数据推送
+ Map<String, Object> map = new HashMap<>(1);
+ map.put(uuid, list);
+ myAsyncService.FTPObjectListUserId(map);
- //数据同步
- saveTrainingRegistration(trainingRegistration1,user);
- }else {
- if (user.getIsTrain()!=1) {
+ Result result = new Result();
+ int count = 0;
+ //调用ftp获取返回数据
+ while (true){
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ //调用ftp获取返回数据
+ result = Monitor.getFtpDataByUuidListTrain(uuid);
+ //如果返回true,就退处
+ if (result.getCode() == 200) {
+ break;
+ }
+// else {
+// count++;
+// if (count == 30) {
+// break;
+// }
+// }
+ }
+
+ //创建集合，存年龄符合要求
+ List<String> ageList = new ArrayList<>();
+ //创建年龄不符合集合
+ List<String> errorList = new ArrayList<>();
+ AtomicInteger number = new AtomicInteger();
+ if (null!=result){
+ //获取 result
+ List<Result> data1 = result.getData();
+ if (data1.size()>0){
+ for (Result result1 : data1) {
+ // 取出 Msg ,此 msg 存的对应的 uuid
+ Long userId = result1.getUserId();
+ if (result1.getCode()==200){
+ //加入新增集合
+ ageList.add(userId.toString());
+ }
+ //年龄不符合要求
+ if (result1.getCode()==201){
+ //number ++
+ number.getAndIncrement();
+ //查询用户信息
+ User user = userService.getById(userId);
+ //加入更新集合
+ errorList.add(user.getRealName());
+ }
+ }
+ }
+ }
+
+ if (ageList.size()>0) {
+ //遍历
+ ageList.forEach(userId -> {
+ User user = userService.getUserById(userId);
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsTrain()) {
TrainingRegistration trainingRegistration1 = new TrainingRegistration();
trainingRegistration1.setCancel(1);
//默认为未考试状态
trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
trainingRegistration1.setTrainingTime(new Date());
trainingRegistration1.setUserId(userId);
trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -238,10 +397,96 @@
userService.updateById(user);
//数据同步
- saveTrainingRegistration(trainingRegistration1,user);
+ saveTrainingRegistration(trainingRegistration1, user);
+ } else {
+ if (user.getIsTrain() != 1) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1, user);
+ }
}
- }
- });
+ });
+ }
+
+ //如果存在年龄不符的，则抛出异常
+ if (number.get()>0){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[18-60]周岁!");
+ }
+ return R.data(200,"报名成功");
+ }
+
+ /**
+ * 批量报名
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/batchTrains")
+ public R batchApplys(@RequestBody TrainingRegistrationVo trainingRegistration){
+ List<String> list = Arrays.asList(trainingRegistration.getUserIds().split(","));
+
+ if (list.size()>0) {
+ //遍历
+ list.forEach(userId -> {
+ User user = userService.getUserById(userId);
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsTrain()) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1, user);
+ } else {
+ if (user.getIsTrain() != 1) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1, user);
+ }
+ }
+ });
+ }
+
+ //如果存在年龄不符的，则抛出异常
+// if (number.get()>0){
+// String errorAccount = StringUtils.join(errorList, "\\\n");
+// throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[18-60]周岁!");
+// }
return R.data(200,"报名成功");
}
@@ -283,17 +528,16 @@
return R.data(detail);
}
-// /**
-// * 导出报名数数据
-// * @param response
-// * @param trainingRegistration 培训报名对象
-// */
-// @GetMapping("export-apply")
-// @ApiOperation(value = "导出报名清册")
-// public void exportApply(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
-// List<TrainingRegistrationExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
-// ExcelUtil.export(response, "培训报名清册数据"+ DateUtil.time(), "培训报名清册数据表", list, TrainingRegistrationExcel.class);
-// }
+ /**
+ * 导出报名数数据
+ * @param response
+ * @param trainingRegistration 培训报名对象
+ */
+ @GetMapping("export-apply-info")
+ public void exportApplyInfo(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
+ List<TrainingRegistrationExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
+ ExcelUtil.export(response, "报名清册数据"+ DateUtil.time(), "报名清册数据表", list, TrainingRegistrationExcel.class);
+ }
@@ -302,8 +546,8 @@
*/
@PostMapping("import-trainingRegistration")
@ApiOperation(value = "导入培训报名数据", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered,Long examId) {
- TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,examId);
+ public R importUser(MultipartFile file, Integer isCovered,String deptId) {
+ TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,deptId);
ExcelUtil.save(file, trainingRegistrationImporter, TrainingRegistrationExcel.class);
return R.success("操作成功");
}
@@ -315,7 +559,13 @@
@ApiOperation(value = "导出模板")
public void exportUser(HttpServletResponse response) {
List<TrainingRegistrationExcel> list = new ArrayList<>();
- ExcelUtil.export(response, "培训报名数据模板", "培训报名数据表", list, TrainingRegistrationExcel.class);
+ //创建示例
+ TrainingRegistrationExcel excel = new TrainingRegistrationExcel();
+ excel.setDeptName("****保安公司");
+ excel.setRealName("张三");
+ excel.setDeptName("360110202201010001");
+ list.add(excel);
+ ExcelUtil.export(response, "培训报名数据模板" + DateUtil.time(), "培训报名数据表", list, TrainingRegistrationExcel.class);
}
@@ -323,57 +573,57 @@
* 生成准考证号码
* @param trainingRegistration 考试报名信息对象
*/
- private String getCandidateNo(TrainingRegistration trainingRegistration) {
- //获取考试信息
- ExamPaper examPaper = examPaperService.getById(trainingRegistration.getTrainExamId());
- if (null!=examPaper.getStartTime()){
- String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
- String year = format.substring(2,4);
- String quarter = null;
- String months = null;
- String days = null;
- int month = Integer.parseInt(format.substring(5,7));
- int day = Integer.parseInt(format.substring(8,10));
- if (month>0 && month<=3){
- quarter = "C";
- }
- if (month>3 && month<=6){
- quarter = "X";
- }
- if (month>6 && month<=9){
- quarter = "Q";
- }
- if (month>9 && month<=12){
- quarter = "D";
- }
- if (month<=9){
- months = "0" + month;
- }
- if (day<=9){
- days = "0" + day;
- }
- //获取考试名称前缀,去除数字，字母
- String examName
- = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
-
- //前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
- String result = year
- + months
- + toFirstChar(examName).toUpperCase()
- + examPaper.getExamType()
- + quarter;
- //查询是当前前缀已生成的数量
- int count = trainingRegistrationService.getCandidateNoCount(result);
- if (count==0){
- return result + "0000";
- }
- //格式化
- DecimalFormat decimalFormat = new DecimalFormat("0000");
- //返回
- return result + (decimalFormat.format(count++));
- }
- return null;
- }
+// private String getCandidateNo(TrainingRegistration trainingRegistration) {
+// //获取考试信息
+// ExamPaper examPaper = examPaperService.getById(trainingRegistration.getTrainExamId());
+// if (null!=examPaper.getStartTime()){
+// String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
+// String year = format.substring(2,4);
+// String quarter = null;
+// String months = null;
+// String days = null;
+// int month = Integer.parseInt(format.substring(5,7));
+// int day = Integer.parseInt(format.substring(8,10));
+// if (month>0 && month<=3){
+// quarter = "C";
+// }
+// if (month>3 && month<=6){
+// quarter = "X";
+// }
+// if (month>6 && month<=9){
+// quarter = "Q";
+// }
+// if (month>9 && month<=12){
+// quarter = "D";
+// }
+// if (month<=9){
+// months = "0" + month;
+// }
+// if (day<=9){
+// days = "0" + day;
+// }
+// //获取考试名称前缀,去除数字，字母
+// String examName
+// = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+//
+// //前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
+// String result = year
+// + months
+// + toFirstChar(examName).toUpperCase()
+// + examPaper.getExamType()
+// + quarter;
+// //查询是当前前缀已生成的数量
+// int count = trainingRegistrationService.getCandidateNoCount(result);
+// if (count==0){
+// return result + "0000";
+// }
+// //格式化
+// DecimalFormat decimalFormat = new DecimalFormat("0000");
+// //返回
+// return result + (decimalFormat.format(count++));
+// }
+// return null;
+// }
/**
@@ -455,105 +705,204 @@
/**
- * 生成试卷,报名
- * @param ids 报名ids
+ * 生成试卷,报名，考试申请
+ * @param trainingRegistrationVo 考试开始时
*/
@PostMapping("/batchExam")
- public R batchExam(@RequestParam String ids,
- String examTime,
- @RequestParam Date startTime,
- Date endTime){
- if (!ids.equals("")){
- List<String> list = Arrays.asList(ids.split(","));
- if (list.size()>0){
- ExamPaper examPaper = new ExamPaper();
-// examPaper.setExamTime(examTime);
- examPaper.setExamType(2);
- examPaper.setStartTime(startTime);
-// examPaper.setEndTime(endTime);
- Calendar instance = Calendar.getInstance();
- instance.setTime(startTime);
- int year = instance.get(Calendar.YEAR);
- int month = instance.get(Calendar.MONTH)+1;
- int day = instance.get(Calendar.DAY_OF_MONTH);
- String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
- examPaper.setExamName(examName);
- //待审核
- examPaper.setAuditStatus(3);
- //生成考试
- examPaperService.save(examPaper);
-
- Long sid = examPaper.getId();
- String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
- String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,audit_status) " +
- "values(" + "'" + sid + "'" +
- "," + "'" + examPaper.getExamName() + "'" +
- "," + "'" + examPaper.getExamType() +"'" +
- "," + "'" + format +"'" +
- "," +"'" + examPaper.getAuditStatus() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
-
- //修改报名信息
- list.forEach(id ->{
- TrainingRegistration trainingRegistration = new TrainingRegistration();
- trainingRegistration.setId(Long.parseLong(id));
- trainingRegistration.setTrainExamId(examPaper.getId().toString());
- trainingRegistrationService.updateById(trainingRegistration);
-
- String s1 =
- "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId()+ "'"
- + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- });
- }
-
+ public R batchExam(@RequestBody TrainingRegistrationVo trainingRegistrationVo){
+ if (trainingRegistrationVo.getNumber()==0){
+ return R.data("报名人数不能小于1人");
}else {
- //查询已报名未关联试卷的人员
- List<Long> applyIds = trainingRegistrationService.getTrainIds();
+ //查询已报名的人员前 number 个
+ //查询已报名未关联试卷的人员,同步报名列表
+ List<TrainingRegistration> applyIds = trainingRegistrationService.getTrainIds(trainingRegistrationVo);
if (applyIds.size()>0){
//生成考试
ExamPaper examPaper = new ExamPaper();
-// examPaper.setExamTime(examTime);
examPaper.setExamType(2);
- examPaper.setStartTime(startTime);
-// examPaper.setEndTime(endTime);
+ examPaper.setStartTime(trainingRegistrationVo.getStartTime());
+ examPaper.setEndTime(trainingRegistrationVo.getEndTime());
Calendar instance = Calendar.getInstance();
- instance.setTime(startTime);
+ instance.setTime(trainingRegistrationVo.getStartTime());
int year = instance.get(Calendar.YEAR);
int month = instance.get(Calendar.MONTH)+1;
int day = instance.get(Calendar.DAY_OF_MONTH);
- String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
+ String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
examPaper.setExamName(examName);
+ examPaper.setCreator(trainingRegistrationVo.getCreator());
//待审核
examPaper.setAuditStatus(3);
+ //创建时间
+ examPaper.setCreatorDate(new Date());
//生成考试
examPaperService.save(examPaper);
Long sid = examPaper.getId();
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
- String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,audit_status) " +
+ String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getEndTime());
+ String creatorTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getCreatorDate());
+ String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,creator,creator_date,audit_status) " +
"values(" + "'" + sid + "'" +
"," + "'" + examPaper.getExamName() + "'" +
"," + "'" + examPaper.getExamType() +"'" +
"," + "'" + format +"'" +
+ "," + "'" + endTimeFormat +"'" +
+ "," + "'" + examPaper.getCreator() +"'" +
+ "," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
//修改报名信息
- applyIds.forEach(id ->{
- TrainingRegistration trainingRegistration = new TrainingRegistration();
- trainingRegistration.setId(id);
- trainingRegistration.setTrainExamId(examPaper.getId().toString());
- trainingRegistrationService.updateById(trainingRegistration);
+ applyIds.forEach(trainingRegistration ->{
+ if(null==trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId()=="") {
+ trainingRegistration.setTrainExamId(examPaper.getId().toString());
+ //提交考试审核
+ trainingRegistration.setAuditStatus(3);
+ trainingRegistrationService.updateById(trainingRegistration);
- String s1 =
- "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId()+ "'"
- + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ String s1 =
+ "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId() + "'"
+ + ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ + " " + "where id = " + "'" + trainingRegistration.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
});
}
}
return null;
}
+
+
+ /**
+ * 生成试卷,报名，考试申请
+ * @param trainingRegistrationVo 考试开始时
+ */
+ @PostMapping("/batchTrainExam")
+ public R batchTrainExam(@RequestBody TrainingRegistrationVo trainingRegistrationVo){
+ //查询已报名未关联试卷的人员,同步报名列表
+ String ids = trainingRegistrationVo.getIds();
+ List<String> list = Arrays.asList(ids.split(","));
+ if (list.size()>0){
+ //生成考试
+ ExamPaper examPaper = new ExamPaper();
+ //考试类型
+ examPaper.setExamType(2);
+ //考试开始时间，考试开始截止时间
+ examPaper.setStartTime(trainingRegistrationVo.getStartTime());
+ examPaper.setEndTime(trainingRegistrationVo.getEndTime());
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(trainingRegistrationVo.getStartTime());
+ int year = instance.get(Calendar.YEAR);
+ int month = instance.get(Calendar.MONTH)+1;
+ int day = instance.get(Calendar.DAY_OF_MONTH);
+ String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
+ //考试名称
+ examPaper.setExamName(examName);
+ //考试申请人
+ examPaper.setCreator(trainingRegistrationVo.getCreator());
+ //待审核
+ examPaper.setAuditStatus(3);
+ //创建时间
+ examPaper.setCreatorDate(new Date());
+ //生成考试
+ examPaperService.save(examPaper);
+ //内网数据同步
+ Long sid = examPaper.getId();
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
+ String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getEndTime());
+ String creatorTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getCreatorDate());
+ String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,creator,creator_date,audit_status) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + examPaper.getExamName() + "'" +
+ "," + "'" + examPaper.getExamType() +"'" +
+ "," + "'" + format +"'" +
+ "," + "'" + endTimeFormat +"'" +
+ "," + "'" + examPaper.getCreator() +"'" +
+ "," + "'" + creatorTimeFormat +"'" +
+ "," +"'" + examPaper.getAuditStatus() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
+
+ //修改报名信息
+ list.forEach(id ->{
+ //根据id查询培训信息
+ TrainingRegistration trainingRegistration = trainingRegistrationService.getById(id);
+ if (trainingRegistration.getAuditStatus()==4 && trainingRegistration.getCancel()==1) {
+ if (null == trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId() == "") {
+ trainingRegistration.setTrainExamId(examPaper.getId().toString());
+ //提交考试审核
+ trainingRegistration.setAuditStatus(3);
+ trainingRegistrationService.updateById(trainingRegistration);
+
+ String s1 =
+ "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId() + "'"
+ + ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ + " " + "where id = " + "'" + trainingRegistration.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
+ }
+ });
+ }
+ return null;
+ }
+
+
+ /**
+ * 是否为会员标记
+ * @param trainingRegistration
+ * @return
+ */
+ @PostMapping("/vipSign")
+ @Transactional(rollbackFor = Exception.class)
+ public R vipSign(@RequestBody TrainingRegistration trainingRegistration){
+ //新增会员记录
+ userVipService.insertUserVipInfo(trainingRegistration);
+ //新增会员题库记录
+ vipTopicService.insertVipTopicInfo(trainingRegistration);
+ //内网报名信息同步
+ String s1 =
+ "update sys_training_registration set vip_status = " + "'" + trainingRegistration.getVipStatus() + "'"
+ + " " + "where id = " + "'" + trainingRegistration.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ //更新并返回数据
+ return R.data(trainingRegistrationService.updateById(trainingRegistration));
+ }
+
+ /**
+ * 批量将已报名人员标记为已缴费
+ * @param trainingRegistration
+ * @return
+ */
+ @PostMapping("/vipSignBatch")
+ @Transactional(rollbackFor = Exception.class)
+ public R vipSignBatch(@RequestBody TrainingRegistrationVo trainingRegistration){
+ //查询已报名，未考试的报名信息
+ List<TrainingRegistration> trainingRegistrationList = trainingRegistrationService.getList(trainingRegistration);
+ if (trainingRegistrationList.size()>0){
+ for (TrainingRegistration registration : trainingRegistrationList) {
+ if (registration.getVipStatus().equals(2)) {
+ registration.setVipStatus(1);
+ //新增会员记录
+ userVipService.insertUserVipInfo(registration);
+ //新增会员题库记录
+ vipTopicService.insertVipTopicInfo(registration);
+ //内网报名信息同步
+ String s1 =
+ "update sys_training_registration set vip_status = " + "'" + registration.getVipStatus() + "'"
+ + " " + "where id = " + "'" + registration.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ //更新
+ trainingRegistrationService.updateById(registration);
+ }
+ }
+ }
+ //返回数据
+ return R.data(true);
+ }
}
--
Gitblit v1.9.3