From 1199c43057ef8f35133249c015a97882055e2914 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 25 Dec 2021 10:26:45 +0800
Subject: [PATCH] 1.单位列表查询排序修改 2.保安员证生成同时插入证件编号记录

---
 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 6791a9b..fa60f2e 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -25,6 +25,8 @@
 import org.springblade.modules.exam.util.SecurityPaperUtil;
 import org.springblade.modules.exam.vo.ExamScoreVO;
 import org.springblade.modules.exam.vo.UpdateParamVo;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.securitypaper.service.SecurityPaperService;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IRoleService;
 import org.springblade.modules.system.service.IUserService;
@@ -55,7 +57,7 @@
 
 	private final ExamPaperService examPaperService;
 
-	private final IRoleService roleService;
+	private final SecurityPaperService securityPaperService;
 
 	/**
 	 * 自定义分页
@@ -187,23 +189,44 @@
 						result = pre + (decimalFormat.format(max));
 					}
 					user1.setSecuritynumber(result);
-					//发证日期
-//					user1.setPaperTime(new Date());
+
+					//生成保安证的同时向保安证管理表中插入一条数据
+					SecurityPaper securityPaper = new SecurityPaper();
+					securityPaper.setUserId(user1.getId());
+					securityPaper.setNumber(result);
+					securityPaper.setCreateTime(new Date());
+					securityPaper.setIdCardNo(user.getCardid());
+					securityPaper.setPeopleName(user1.getRealName());
+					securityPaper.setExamId(Long.parseLong(examScore1.getExamId()));
+					securityPaper.setApplyId(examScore1.getApplyId());
+					//新增保安员证信息
+					securityPaperService.save(securityPaper);
 					//修改为持证保安
 					user1.setHold("1");
-					//分配保安角色
-//					Role role = new Role();
-//					role.setRoleAlias("保安");
-//					Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-//					user.setRoleId(oneRole.getId().toString());
 					//更新保安数据
 					userService.updateById(user1);
 
+					//数据同步
 					String s1 =
 						"update blade_user set hold = " + "'" + user1.getHold() + "'" +
 							",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
 							",user_type = " + "'" + user1.getUserType() + "'" +
 							" " + "where id = " + "'" + user1.getId() + "'";
+
+//					String s1 =
+//						"insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id) " +
+//							"values(" + "'" + securityPaper.getId() + "'"
+//							+ "," + "'" + securityPaper.getNumber() +"'"
+//							+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(securityPaper.getCreateTime()) +"'"
+//							+ "," + "'" + securityPaper.getPeopleName() + "'"
+//							+ "," + "'" + securityPaper.getIdCardNo() + "'"
+//							+ "," + "'" + securityPaper.getUserId() + "'"
+//							+ "," + "'" + securityPaper.getApplyId() + "'"
+//							+ "," +"'" + securityPaper.getExamId() + "'" + ");" +
+//						"update blade_user set hold = " + "'" + user1.getHold() + "'" +
+//							",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
+//							",user_type = " + "'" + user1.getUserType() + "'" +
+//							" " + "where id = " + "'" + user1.getId() + "'";
 					FtpUtil.sqlFileUpload(s1);
 				}
 			} else {

--
Gitblit v1.9.3