From 4d9dc12feb33c0470b9a07b7f20159c0a9e9efc4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 22:47:33 +0800
Subject: [PATCH] 考试生成后,导入报名

---
 src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 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 6c8b036..9378c2c 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
@@ -105,7 +105,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();
@@ -120,6 +120,12 @@
 					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);
@@ -127,9 +133,14 @@
 
 					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,apply_time,apply_status,is_exam) " +
-						"values(" + "'" + id + "'" + "," + "'" + apply1.getUserId() + "'" + "," + "'" + formatStr +
-						"'" + "," + "'" + apply1.getApplyStatus() + "'" + "," +"'" + apply1.getIsExam() + "'" + ");" +
+					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 {
@@ -140,6 +151,11 @@
 						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);
@@ -148,9 +164,14 @@
 						//内网数据同步
 						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,apply_time,apply_status,is_exam) " +
-							"values(" + "'" + id + "'" + "," + "'" + apply1.getUserId() + "'" + "," + "'" + formatStr +
-							"'" + "," + "'" + apply1.getApplyStatus() + "'" + "," +"'" + apply1.getIsExam() + "'" + ");" +
+						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);
 					}

--
Gitblit v1.9.3