From 99240e80f8cc18c1944bc9f5c7e48c47c751cd45 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 14:46:25 +0800
Subject: [PATCH] 培训报名考试申请后导入报名数据修改，保安公司查询接口修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 101 insertions(+), 13 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 d04e472..2a3789f 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -16,6 +16,7 @@
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.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyImporter;
import org.springblade.modules.apply.excel.ApplyInfoExcel;
@@ -90,12 +91,16 @@
user1.setId(Long.parseLong(trainingRegistration.getUserId()));
user1.setIsTrain(1);
userService.updateById(user1);
+
+ //内网数据同步
+ saveTrainingRegistration(trainingRegistration,user1);
+
return R.data(200,"报名成功");
}else {
if (1==user.getIsTrain()){
return R.data(201,"已报名，不能重复报名");
}
- if (2==user.getIsTrain()){
+ if (1!=user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
//默认为未考试状态
@@ -108,10 +113,31 @@
user1.setId(Long.parseLong(trainingRegistration.getUserId()));
user1.setIsTrain(1);
userService.updateById(user1);
+
+ //内网数据同步
+ saveTrainingRegistration(trainingRegistration,user1);
+
return R.data(200,"报名成功");
}
}
return R.data(202,"报名失败");
+ }
+
+ /**
+ * 报名
+ */
+ 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 s = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam) " +
+ "values(" + "'" + id + "'"
+ + "," + "'" + trainingRegistration.getTrainingUnitId() +"'"
+ + "," + "'" + formatStr +"'"
+ + "," + "'" + trainingRegistration.getCancel() + "'"
+ + "," + "'" + trainingRegistration.getUserId() + "'"
+ + "," +"'" + trainingRegistration.getIsExam() + "'" + ");" +
+ "update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
}
@@ -129,26 +155,47 @@
//修改保安报名状态
user.setIsTrain(2);
userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
if (status){
return R.data(200,"取消报名成功");
}
}else {
- if (user.getIsTrain()==2) {
- return R.data(201,"尚未报名");
- }
if(user.getIsTrain()==1){
trainingRegistration.setCancel(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,"尚未报名");
}
}
return R.data(202,"取消报名失败");
+ }
+
+
+ /**
+ * 取消报名同步
+ */
+ private void cancelTrainingRegistrationSync(TrainingRegistration trainingRegistration,User user){
+ String s =
+ "update sys_training_registration set cancel = " + trainingRegistration.getCancel() + " " +"where id = " + "'" + trainingRegistration.getId() + "';" +
+ "update blade_user set is_train = " + user.getIsTrain() + " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
}
/**
@@ -168,22 +215,30 @@
trainingRegistration1.setIsExam(1);
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()==2) {
+ if (user.getIsTrain()!=1) {
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);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1,user);
}
}
});
@@ -247,8 +302,8 @@
*/
@PostMapping("import-trainingRegistration")
@ApiOperation(value = "导入培训报名数据", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered) {
- TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false);
+ public R importUser(MultipartFile file, Integer isCovered,Long examId) {
+ TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,examId);
ExcelUtil.save(file, trainingRegistrationImporter, TrainingRegistrationExcel.class);
return R.success("操作成功");
}
@@ -405,17 +460,17 @@
*/
@PostMapping("/batchExam")
public R batchExam(@RequestParam String ids,
- @RequestParam String examTime,
+ String examTime,
@RequestParam Date startTime,
- @RequestParam Date endTime){
+ Date endTime){
if (!ids.equals("")){
List<String> list = Arrays.asList(ids.split(","));
if (list.size()>0){
ExamPaper examPaper = new ExamPaper();
- examPaper.setExamTime(examTime);
+// examPaper.setExamTime(examTime);
examPaper.setExamType(2);
examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
+// examPaper.setEndTime(endTime);
Calendar instance = Calendar.getInstance();
instance.setTime(startTime);
int year = instance.get(Calendar.YEAR);
@@ -427,12 +482,28 @@
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);
});
}
@@ -442,10 +513,10 @@
if (applyIds.size()>0){
//生成考试
ExamPaper examPaper = new ExamPaper();
- examPaper.setExamTime(examTime);
+// examPaper.setExamTime(examTime);
examPaper.setExamType(2);
examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
+// examPaper.setEndTime(endTime);
Calendar instance = Calendar.getInstance();
instance.setTime(startTime);
int year = instance.get(Calendar.YEAR);
@@ -457,12 +528,29 @@
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);
+
+
//修改报名信息
applyIds.forEach(id ->{
TrainingRegistration trainingRegistration = new TrainingRegistration();
trainingRegistration.setId(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);
});
}
}
--
Gitblit v1.9.3