From e31bd843f6820f8e5931d9276f3fb10a045de054 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 25 Sep 2021 23:58:07 +0800
Subject: [PATCH] 用户导入修改，培训报名批量导入修改审核状态
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 4 ++--
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 12 ++++++------
src/main/resources/application-test.yml | 6 +++---
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcel.java b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
index 56c8285..dd72e7c 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -42,28 +42,28 @@
// @ExcelProperty("账号")
// private String account;
- @ExcelProperty("单位名称")
+ @ExcelProperty("单位名称*")
private String deptId;
@ColumnWidth(10)
- @ExcelProperty("姓名")
+ @ExcelProperty("姓名*")
private String realName;
@ExcelProperty("邮箱")
private String email;
@ColumnWidth(15)
- @ExcelProperty("联系电话")
+ @ExcelProperty("联系电话*")
private String phone;
- @ExcelProperty("性别")
+ @ExcelProperty("性别*")
private String sex;
// @ExcelProperty("出生日期")
// private Date birthday;
- @ExcelProperty("身份证号")
+ @ExcelProperty("身份证号*")
private String cardid;
@ExcelProperty("籍贯")
@@ -89,7 +89,7 @@
@ExcelProperty("入职时间")
private String rtime;
- @ExcelProperty("是否持证")
+ @ExcelProperty("是否持证*")
private String hold;
@ExcelProperty("保安员证编码")
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 0947760..778edf5 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -293,7 +293,7 @@
//默认为未考试状态
trainingRegistration1.setIsExam(1);
//未提交考试审核
- trainingRegistration.setAuditStatus(4);
+ trainingRegistration1.setAuditStatus(4);
trainingRegistration1.setTrainingTime(new Date());
trainingRegistration1.setUserId(userId);
trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -311,7 +311,7 @@
//默认为未考试状态
trainingRegistration1.setIsExam(1);
//未提交考试审核
- trainingRegistration.setAuditStatus(4);
+ trainingRegistration1.setAuditStatus(4);
trainingRegistration1.setTrainingTime(new Date());
trainingRegistration1.setUserId(userId);
trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index ce6644c..4c709df 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -98,7 +98,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
- trainingRegistration.setAuditStatus(3);
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
@@ -133,6 +133,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 95ae4c1..d971c80 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -40,10 +40,10 @@
#ftp 设置
ftp:
sqlConnect: jdbc:mysql://223.82.109.183:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- ftpHost: 192.168.0.110
+ ftpHost: 192.168.0.199
ftpPort: 21
- ftpUserName: anonymous
- ftpPassword:
+ ftpUserName: arsn
+ ftpPassword: 123456
ftpPath: anbao/
localPath: D:\\anbao\\
ip: http://223.82.109.183:2081
--
Gitblit v1.9.3