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/exam/controller/ExamScoreController.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 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 14f26a7..90210f8 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -135,14 +135,16 @@
 					//去生成保安证编号
 					String pre = SecurityPaperUtil.getSecurityPaper();
 					//查询当前年份已有的保安证编号
-					int count = userService.getSecurityPaperCount(pre);
+					int max = userService.getSecurityPaperCount(pre);
 					String result = null;
-					if (count == 0) {
+					if (max == 0) {
 						result = pre + "00000";
 					} else {
 						//格式化
 						DecimalFormat decimalFormat = new DecimalFormat("00000");
-						result = pre + (decimalFormat.format(count++));
+						max++;
+						System.out.println("max = " + max);
+						result = pre + (decimalFormat.format(max));
 					}
 					user.setSecuritynumber(result);
 					//发证日期
@@ -150,16 +152,15 @@
 					//修改为持证保安
 					user.setHold("1");
 					//分配保安角色
-					Role role = new Role();
-					role.setRoleAlias("保安");
-					Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-					user.setRoleId(oneRole.getId().toString());
+//					Role role = new Role();
+//					role.setRoleAlias("保安");
+//					Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+//					user.setRoleId(oneRole.getId().toString());
 					//更新保安数据
 					userService.updateById(user);
 
 					String s1 =
-						"update blade_user set role_id = " + "'" + user.getRoleId() + "'" +
-							",hold = " + "'" + user.getHold() + "'" +
+						"update blade_user set hold = " + "'" + user.getHold() + "'" +
 							",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
 							",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
 							" " + "where id = " + "'" + user.getId() + "'";

--
Gitblit v1.9.3