From a144dec759ca53e72a6421596fda2e92b468084f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 11:57:51 +0800
Subject: [PATCH] 数据操作同步监管后台
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 c0a4403..12aad1c 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -9,6 +9,7 @@
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.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -18,6 +19,7 @@
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyImporter;
import org.springblade.modules.apply.service.ApplyService;
+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.service.ExamPaperService;
@@ -27,10 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
/**
* @author zhongrj
@@ -91,7 +90,7 @@
* @param apply 考试报名信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody Apply apply) {
+ public R submit(@RequestBody Apply apply) throws Exception {
if (null==apply.getId()){
//去生成准考证号码
apply.setCandidateNo(getCandidateNo(apply));
@@ -99,7 +98,16 @@
apply.setApplyCode(getApplyCode(apply));
//默认通过
apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
apply.setApplyTime(new Date());
+ //内网新增
+ arg.test01(arg.url+"/apply/save",apply);
+ }
+ //内网修改
+ if(null!=apply.getId()){
+ //修改
+ arg.test01(arg.url+"/apply/update",apply);
}
return R.status(applyService.saveOrUpdate(apply));
}
@@ -184,7 +192,7 @@
/**
- * 生成准考证号码
+ * 生成报名编号
* @param apply 考试报名信息对象
*/
private String getApplyCode(Apply apply) {
@@ -266,6 +274,7 @@
*/
@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)));
}
@@ -282,4 +291,20 @@
return R.data(detail);
}
+ /**
+ * 获取准考证信息
+ * @param apply
+ * @return
+ */
+ @GetMapping("/getApplyInfo")
+ public R<ApplyPaPerVO> getApplyInfo(Apply apply,HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ //查询考试报名详情
+ ApplyPaPerVO detail = applyService.getApplyInfo(apply);
+ //返回
+ return R.data(detail);
+ }
+
}
--
Gitblit v1.9.3