From bafe10232e18d07f731a74c8df4e63b4cd06b70b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 17 Sep 2021 15:10:20 +0800
Subject: [PATCH] 1.用户新增审查时间 2.派遣更改修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 6 ++++--
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java | 8 +++++++-
src/main/java/org/springblade/modules/system/entity/User.java | 8 ++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
index 2b9c288..4bb23ec 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -173,9 +173,10 @@
//数据同步
String s1 =
- "insert into sys_dispatcher(id,dispatcherTime,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction,create_time,status) " +
+ "insert into sys_dispatcher(id,dispatcherTime,dispatcherAddress,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction,create_time,status) " +
"values(" + "'" + dispatcher.getId() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" + "," +
+ "'" + dispatcher.getDispatcheraddress() + "'" + "," +
"'" + dispatcher.getDispatcherUnitId() + "'" + "," +
"'" + dispatcher.getUserIds() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" + "," +
@@ -212,13 +213,14 @@
"update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
" " +"where id = " + "'" + user.getId() + "';"+
"update sys_dispatcher set dispatcherTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" +
+ ",dispatcherAddress = " + "'" + dispatcher.getDispatcheraddress() + "'" +
",dispatcher_unit_id = " + "'" + dispatcher.getDispatcherUnitId() + "'" +
",user_ids = " + "'" + dispatcher.getUserIds() + "'" +
",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" +
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher.getUpdateTime()) + "'" +
",dept_id = " + "'" + dispatcher.getDeptId() + "'" +
",jurisdiction = " + "'" + dispatcher.getJurisdiction() + "'" +
- " " +"where id = " + "'" + user.getId() + "';"+
+ " " +"where id = " + "'" + dispatcher.getId() + "';"+
"update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
" " +"where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s1);
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index 6695448..6193435 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -36,6 +36,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* 服务实现类
@@ -100,7 +102,11 @@
}
if (dispatcherUnitExcel.getName()!=null && dispatcherUnitExcel.getName()!=""){
- dispatcherUnit.setName(dispatcherUnitExcel.getName());
+ //仅中文
+ String chinese = "^[\\u4E00-\\u9FA5\\uF900-\\uFA2D]+$";
+ Pattern compile = Pattern.compile(chinese);
+ String name = compile.matcher(dispatcherUnitExcel.getName()).replaceAll("");
+ dispatcherUnit.setName(name);
}
if (dispatcherUnitExcel.getLinkman()!=null && dispatcherUnitExcel.getLinkman()!=""){
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 60e1f17..1e2f0dc 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -247,4 +247,12 @@
* 是否缴纳保险 0：是 1：否
*/
private Integer insurance;
+
+ /**
+ * 审查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("audit_time")
+ private Date auditTime;
}
--
Gitblit v1.9.3