From 247abfbc0b322a04f8dc5fcf01fe7989b25fd7e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 04 Nov 2021 10:35:29 +0800
Subject: [PATCH] 保安员发证时间更新接口新增
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 8 ++++++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 22 ++++++++++++++++++++++
src/main/java/org/springblade/modules/system/vo/UserVO.java | 6 ++++++
3 files changed, 36 insertions(+), 0 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 e7de14e..7c0f4c9 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -282,6 +282,28 @@
return R.success("修改成功");
}
+
+ /**
+ * 修改发证时间
+ */
+ @PostMapping("/updatePaperTime")
+ public R updatePaperTime(@RequestBody User user) {
+ user.setPaperTime(new Date());
+ userService.updateById(user);
+ String paperTime = null;
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = null;
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+ }
+ String s1 =
+ "update blade_user set paper_time = " + "'" + paperTime + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("修改成功");
+ }
+
/**
* 删除
*/
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index ad285a3..1fa857b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -53,6 +53,7 @@
<!--带坐标-->
<select id="selectUserPages" resultMap="userResultMap">
select
+ distinct
bu.*,
sll.longitude,sll.latitude,
bd.dept_name
@@ -78,6 +79,10 @@
blade_role br
on
br.id = bu.role_id
+ left join
+ sys_training_registration str
+ on
+ bu.id = str.user_id
where
bu.is_deleted = 0
and bd.parent_id!=1425365577303621633
@@ -101,6 +106,9 @@
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
+ <if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
+ and str.training_unit_id = #{user.trainingUnitId}
+ </if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index ee13f63..a0e8276 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -118,4 +118,10 @@
private Integer examType;
+ /**
+ * 培训公司id
+ */
+ private String trainingUnitId;
+
+
}
--
Gitblit v1.9.3