From d724b0c1a42f564845254f1da7c456aedaeb9fdd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 03 Nov 2021 19:55:23 +0800
Subject: [PATCH] 1.新增制证申请 2.新增保安员证信息导出（包含图片，二维码）
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 6c4ee81..e7de14e 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -33,6 +33,8 @@
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
+import org.springblade.common.excel.CustomCellWriteHeightConfig;
+import org.springblade.common.excel.CustomCellWriteWeightConfig;
import org.springblade.common.excel.RowWriteHandler;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
@@ -50,6 +52,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -242,6 +245,14 @@
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
}
+ String paperTime;
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = null;
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+ }
+
String s1 =
"update blade_user set account = " + "'" + user.getAccount() + "'"
+ ",name = " + "'" + user.getName() + "'"
@@ -403,6 +414,7 @@
// List<UserExcel> list = userService.exportUser(queryWrapper);
// ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
// }
+
/**
* 导出模板
@@ -627,10 +639,17 @@
//用户新增
boolean status = userService.save(user);
String rtime;
+ String paperTime;
if (user.getRtime() == null) {
rtime = null;
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ }
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = "";
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
}
//头像
if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
@@ -642,8 +661,11 @@
user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
}
- String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
+ String s = "insert into blade_user(" +
+ "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
+ "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime," +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -662,11 +684,11 @@
"," + "'" + user.getFingerprint() + "'" +
"," + "'" + user.getEducation() + "'" +
"," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'"
- + "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getHealstats() + "'"+
+ "," + "'" + user.getHeight() + "'" +
"," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" + "," +
- "'" + rtime + "'" +
+ "," + "'" + user.getRegistered() + "'" +
+ "," +"'" + rtime + "'" +
"," + "'" + user.getSecuritynumber() + "'" +
"," + "'" + user.getHold() + "'" +
"," + "'" + user.getJurisdiction() + "'" +
--
Gitblit v1.9.3