From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 428 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 333 insertions(+), 95 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index bf57b07..08e8994 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -1,5 +1,6 @@
package org.springblade.modules.apply.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -16,6 +17,8 @@
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.OutJson;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyImporter;
@@ -24,16 +27,23 @@
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.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+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.*;
/**
* @author zhongrj
@@ -50,6 +60,8 @@
private final ExamPaperService examPaperService;
private final IUserService userService;
+
+ private final ExamScoreService examScoreService;
/**
* 自定义分页
@@ -72,13 +84,69 @@
}
/**
- * 新增
+ * 新增报名
* @param apply 考试报名信息对象
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入apply")
- public R save(@RequestBody Apply apply) {
- return R.status(applyService.save(apply));
+ public R save(@RequestBody Apply apply){
+ //查询人员是否已报名
+ User user = userService.getById(apply.getUserId());
+ if (null==user.getIsApply()){
+ //默认通过
+ apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
+ apply.setApplyTime(new Date());
+ //报名
+ applyService.save(apply);
+ //修改保安报名状态
+ User user1 = new User();
+ user1.setId(apply.getUserId());
+ user1.setIsApply(1);
+ userService.updateById(user1);
+
+ //内网数据同步
+ saveApply(apply,user1);
+
+ return R.data(200,"报名成功");
+ }else {
+ if (1==user.getIsApply()){
+ return R.data(201,"已报名，不能重复报名");
+ }
+ if (1!=user.getIsApply()){
+ //默认通过
+ apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
+ apply.setApplyTime(new Date());
+ applyService.save(apply);
+ //修改保安报名状态
+ User user1 = new User();
+ user1.setId(apply.getUserId());
+ user1.setIsApply(1);
+ userService.updateById(user1);
+
+ //内网数据同步
+ saveApply(apply,user1);
+
+ return R.data(200,"报名成功");
+ }
+ }
+ return R.data(202,"报名失败");
+ }
+
+ /**
+ * 报名
+ */
+ private void saveApply(Apply apply,User user1){
+ String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ Long id = apply.getId();
+ String s = "insert into sys_apply(id,user_id,apply_time,apply_status,is_exam) " +
+ "values(" + "'" + id + "'" + "," + "'" + apply.getUserId() + "'" + "," + "'" + formatStr +
+ "'" + "," + "'" + apply.getApplyStatus() + "'" + "," +"'" + apply.getIsExam() + "'" + ");" +
+ "update blade_user set is_apply = " + user1.getIsApply() + " " +"where id = " + "'" + user1.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
}
@@ -96,66 +164,8 @@
* @param apply 考试报名信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody Apply apply) throws Exception {
- if (null==apply.getId()){
- //查询人员是否已报名
- User user = userService.getById(apply.getUserId());
- if (null==user.getIsApply()){
- //默认通过
- apply.setApplyStatus(2);
- //默认为未考试状态
- apply.setIsExam(1);
- apply.setApplyTime(new Date());
- //修改保安报名状态
- User user1 = new User();
- user1.setId(apply.getUserId());
- user1.setIsApply(1);
- userService.updateById(user1);
- return R.data(200,"报名成功");
- }else {
- if (1==user.getIsApply()){
- return R.data(201,"已报名，不能重复报名");
- }
- if (2==user.getIsApply()){
- //默认通过
- apply.setApplyStatus(2);
- //默认为未考试状态
- apply.setIsExam(1);
- apply.setApplyTime(new Date());
- //修改保安报名状态
- User user1 = new User();
- user1.setId(apply.getUserId());
- user1.setIsApply(1);
- userService.updateById(user1);
- return R.data(200,"报名成功");
- }
- }
-
- //去生成准考证号码
-// apply.setCandidateNo(getCandidateNo(apply));
- //去生成考试编号
-// apply.setApplyCode(getApplyCode(apply));
-
- }else {
- //修改保安报名状态
- User user = new User();
- user.setId(apply.getUserId());
- user.setIsApply(2);
- userService.updateById(user);
- }
- apply.setApplyStatus(4);
- boolean status = applyService.saveOrUpdate(apply);
- if (status){
- //内网新增
-// arg.test01(arg.url+"/apply/save",apply);
- return R.data(200,"取消报名成功");
- }
-// //内网修改
-// if(null!=apply.getId()){
-// //修改
-// arg.test01(arg.url+"/apply/update",apply);
-// }
- return R.data(202,"报名失败");
+ public R submit(@RequestBody Apply apply){
+ return R.data(applyService.saveOrUpdate(apply));
}
@@ -165,7 +175,18 @@
@PostMapping("import-apply")
@ApiOperation(value = "导入报名考试数据", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- ApplyImporter applyImporter = new ApplyImporter(applyService, false);
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false,null);
+ ExcelUtil.save(file, applyImporter, ApplyExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导入报名考试数据(已生成考试)
+ */
+ @PostMapping("import-applys")
+ @ApiOperation(value = "导入报名考试数据", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered,Long examId) {
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false,examId);
ExcelUtil.save(file, applyImporter, ApplyExcel.class);
return R.success("操作成功");
}
@@ -348,8 +369,20 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- //arg.sendPostRemoveByIds(arg.url+"/apply/remove",ids);
return R.status(applyService.removeByIds(Func.toLongList(ids)));
+ }
+
+ /**
+ * 查询用户详情
+ * @param user
+ */
+ @GetMapping("/userDetail")
+ @ApiOperation(value = "详情", notes = "传入apply")
+ public R<User> details(User user) {
+ //用户详情
+ User user1 = userService.getById(user.getId());
+ //返回
+ return R.data(user1);
}
/**
@@ -395,24 +428,87 @@
//修改保安报名状态
user.setIsApply(2);
userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply,user);
+
if (status){
return R.data(200,"取消报名成功");
}
+
}else {
- if (user.getIsApply()==2) {
- return R.data(201,"尚未报名");
- }
if(user.getIsApply()==1){
apply.setApplyStatus(4);
boolean status = applyService.updateById(apply);
//修改保安报名状态
user.setIsApply(2);
userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply,user);
+
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }else {
+ return R.data(201,"尚未报名");
+ }
+ }
+ return R.data(202,"取消报名失败");
+ }
+
+ /**
+ * 取消报名同步
+ */
+ private void cancelApplySync(Apply apply,User user){
+ String s =
+ "update sys_apply set apply_status = " + apply.getApplyStatus() + " " +"where id = " + "'" + apply.getId() + "';" +
+ "update blade_user set is_apply = " + user.getIsApply() + " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
+ }
+
+
+ /**
+ * 公司报名列表取消报名，无applyId
+ * @param apply 考试报名信息对象
+ */
+ @PostMapping("/cancelApplyNotApplyId")
+ public R cancelApplyNotApplyId(@RequestBody Apply apply){
+ //查询人员是否已报名
+ User user = userService.getById(apply.getUserId());
+ //查询报名信息，取最新的一条（即当前userId,）applyId最大的一条记录
+ Apply apply1 = applyService.getMaxApplyIdByUserIdInfo(apply.getUserId());
+ if(null==user.getIsApply()){
+ apply1.setApplyStatus(4);
+ boolean status = applyService.updateById(apply1);
+ //修改保安报名状态
+ user.setIsApply(2);
+ userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply1,user);
+
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }else {
+ if (user.getIsApply()!=1) {
+ return R.data(201,"尚未报名");
+ }
+ if(user.getIsApply()==1){
+ apply1.setApplyStatus(4);
+ boolean status = applyService.updateById(apply1);
+ //修改保安报名状态
+ user.setIsApply(2);
+ userService.updateById(user);
+
+ //取消报名同步
+ cancelApplySync(apply1,user);
+
if (status){
return R.data(200,"取消报名成功");
}
}
-
}
return R.data(202,"取消报名失败");
}
@@ -420,27 +516,16 @@
/**
* 批量报名
- * @param apply 考试报名信息对象
+ * @param ids userIds 人员
*/
@PostMapping("/batchApply")
- public R batchApply(@RequestBody ApplyVO apply){
- List<String> list = Arrays.asList(apply.getUserIds().split(","));
- list.forEach(userId ->{
- User user = userService.getById(userId);
- //未报名的新增，已报名的不做处理
- if (null==user.getIsApply()) {
- Apply apply1 = new Apply();
- apply1.setApplyStatus(2);
- //默认为未考试状态
- apply1.setIsExam(1);
- apply1.setApplyTime(new Date());
- apply1.setUserId(Long.parseLong(userId));
- applyService.save(apply1);
- //修改保安报名状态
- user.setIsApply(1);
- userService.updateById(user);
- }else {
- if (user.getIsApply()==2) {
+ public R batchApply(@RequestParam String ids,@RequestParam String deptId){
+ if (!ids.equals("")) {
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(userId -> {
+ User user = userService.getById(userId);
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsApply()) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -451,9 +536,67 @@
//修改保安报名状态
user.setIsApply(1);
userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
+ } else {
+ if (user.getIsApply() != 1) {
+ Apply apply1 = new Apply();
+ apply1.setApplyStatus(2);
+ //默认为未考试状态
+ apply1.setIsExam(1);
+ apply1.setApplyTime(new Date());
+ apply1.setUserId(Long.parseLong(userId));
+ applyService.save(apply1);
+ //修改保安报名状态
+ user.setIsApply(1);
+ userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
+ }
}
+ });
+ }else {
+ //查询所有未报名的人员
+ List<User> users = userService.getNotApplyIdList(deptId);
+ if (users.size()>0){
+ users.forEach(user ->{
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsApply()) {
+ Apply apply1 = new Apply();
+ apply1.setApplyStatus(2);
+ //默认为未考试状态
+ apply1.setIsExam(1);
+ apply1.setApplyTime(new Date());
+ apply1.setUserId(user.getId());
+ applyService.save(apply1);
+ //修改保安报名状态
+ user.setIsApply(1);
+ userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
+ } else {
+ if (user.getIsApply() != 1) {
+ Apply apply1 = new Apply();
+ apply1.setApplyStatus(2);
+ //默认为未考试状态
+ apply1.setIsExam(1);
+ apply1.setApplyTime(new Date());
+ apply1.setUserId(user.getId());
+ applyService.save(apply1);
+ //修改保安报名状态
+ user.setIsApply(1);
+ userService.updateById(user);
+
+ //内网数据同步
+ saveApply(apply1,user);
+ }
+ }
+ });
}
- });
+ }
return R.data(200,"报名成功");
}
@@ -465,17 +608,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(1);
examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
+// examPaper.setEndTime(endTime);
Calendar instance = Calendar.getInstance();
instance.setTime(startTime);
int year = instance.get(Calendar.YEAR);
@@ -485,6 +628,14 @@
examPaper.setExamName(examName);
//生成考试
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) " +
+ "values(" + "'" + sid + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
+ "'" + "," +"'" + format + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+
//修改报名信息
list.forEach(id ->{
Apply apply = new Apply();
@@ -492,6 +643,11 @@
apply.setExamId(examPaper.getId());
apply.setCandidateNo(getCandidateNo(apply));
applyService.updateById(apply);
+
+ String s1 =
+ "update sys_apply set exam_id = " + apply.getExamId() + ",candidate_no = " + "'" + apply.getCandidateNo() + "'" +
+ " " +"where id = " + "'" + apply.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
});
}
@@ -501,10 +657,10 @@
if (applyIds.size()>0){
//生成考试
ExamPaper examPaper = new ExamPaper();
- examPaper.setExamTime(examTime);
+// examPaper.setExamTime(examTime);
examPaper.setExamType(1);
examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
+// examPaper.setEndTime(endTime);
Calendar instance = Calendar.getInstance();
instance.setTime(startTime);
int year = instance.get(Calendar.YEAR);
@@ -514,6 +670,14 @@
examPaper.setExamName(examName);
//生成考试
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) " +
+ "values(" + "'" + sid + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
+ "'" + "," +"'" + format + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+
//修改报名信息
applyIds.forEach(id ->{
Apply apply = new Apply();
@@ -521,6 +685,11 @@
apply.setExamId(examPaper.getId());
apply.setCandidateNo(getCandidateNo(apply));
applyService.updateById(apply);
+
+ String s1 =
+ "update sys_apply set exam_id = " + apply.getExamId() + ",candidate_no = " + "'" + apply.getCandidateNo() + "'" +
+ " " +"where id = " + "'" + apply.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
});
}
}
@@ -538,4 +707,73 @@
return applyService.getApplyDetailList(apply);
}
+
+ /**
+ * 查询保安员个人报名信息
+ * @param apply 报名信息，包含userId
+ * @return
+ */
+ @GetMapping("/getSecurityApplyDetail")
+ public ApplyVO getSecurityApplyDetail(ApplyVO apply){
+ return applyService.getSecurityApplyDetail(apply);
+ }
+
+
+ /**
+ * 修改考试状态
+ * @param apply 报名信息，包含userId，applyid
+ * @return
+ */
+ @PostMapping("/updateApplyStatus")
+ public ExamScore updateApplyStatus(@RequestBody ApplyVO apply){
+ applyService.updateApplyStatus(apply);
+ //新增考试成绩，没有成绩数据，待提交答题后更新数据
+ ExamScore examScore = new ExamScore();
+ examScore.setExamId(apply.getExamId().toString());
+ examScore.setUserId(apply.getUserId().toString());
+ examScore.setApplyId(apply.getId());
+ examScore.setExamTime(new Date());
+ //新增考试成绩
+ examScoreService.save(examScore);
+ //内网同步
+ Long sid = examScore.getId();
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examScore.getExamTime());
+// String s = "insert into exam_score(id,exam_time,user_id,exam_id,apply_id) " +
+// "values(" + "'" + sid + "'" + "," + "'" +
+// format + "'" + "," + "'" +
+// examScore.getUserId() +"'" + "," +"'" +
+// examScore.getExamId() +"'" + "," +"'" +
+// examScore.getApplyId() + "'" + ")";
+// FtpUtil.sqlFileUpload(s);
+ return examScore;
+ }
+
+
+
+ /**
+ * test
+ * @return
+ */
+ @GetMapping("/test")
+ public Object test(){
+ String s1 = "insert into exam_score(id,exam_id,apply_id) values(223,88,315)";
+ String s2 = "111222333";
+ String s3 = "select * from ksxt_exam";
+ FtpUtil.sqlFileUpload(s1);
+ FtpUtil.sqlFileUpload(s2);
+// FtpUtil.sqlFileUpload(s3);
+ String json1 = JSON.toJSONString(s3);
+ String response1 = String.valueOf((new Date()).getTime());
+ OutJson.createJsonFile(json1, localPath, "f"+response1);
+ FileInputStream in1 = null;
+ try {
+ in1 = new FileInputStream(new File(localPath + "f"+response1+".json"));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "f"+response1+".json", in1);
+ return "成功";
+ }
+
+
}
--
Gitblit v1.9.3