From 065f5c6e6ef3fb461a7cee9cb5b53672727c2c4e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Dec 2023 11:08:34 +0800
Subject: [PATCH] 考勤修改，用户查询详情接口
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 6 ++
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java | 2
src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.xml | 1
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 6 ++
src/main/java/org/springblade/modules/system/vo/UserInfoDetail.java | 63 +++++++++++++++++++++
src/main/java/org/springblade/modules/post/controller/PostFilingController.java | 4 -
src/main/java/org/springblade/modules/post/entity/PostFiling.java | 34 ++---------
src/main/java/org/springblade/modules/system/controller/UserController.java | 10 +++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 3 +
src/main/java/org/springblade/modules/system/service/IUserService.java | 3 +
10 files changed, 101 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
index 162067e..2f69372 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -115,6 +115,8 @@
.set("Id", user.getId())
.set("rname", userInfo.getRoles())
.set("list", user)
+ //是否持证
+ .set("hold",user.getHold())
.set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
.set(TokenConstant.ACCOUNT, user.getAccount())
.set(TokenConstant.USER_NAME, user.getAccount())
diff --git a/src/main/java/org/springblade/modules/post/controller/PostFilingController.java b/src/main/java/org/springblade/modules/post/controller/PostFilingController.java
index ca81571..ed576f9 100644
--- a/src/main/java/org/springblade/modules/post/controller/PostFilingController.java
+++ b/src/main/java/org/springblade/modules/post/controller/PostFilingController.java
@@ -70,10 +70,6 @@
*/
@PostMapping("/save")
public R save(@Valid @RequestBody PostFiling postFiling) {
- postFiling.setCreateTime(new Date());
- postFiling.setCreateUser(AuthUtil.getUserId());
- postFiling.setUpdateTime(new Date());
- postFiling.setUpdateUser(AuthUtil.getUserId());
return R.status(postFilingService.save(postFiling));
}
diff --git a/src/main/java/org/springblade/modules/post/entity/PostFiling.java b/src/main/java/org/springblade/modules/post/entity/PostFiling.java
index e48f71c..f87f2d4 100644
--- a/src/main/java/org/springblade/modules/post/entity/PostFiling.java
+++ b/src/main/java/org/springblade/modules/post/entity/PostFiling.java
@@ -22,6 +22,7 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -34,7 +35,7 @@
*/
@Data
@TableName("sys_post_filing")
-public class PostFiling implements Serializable {
+public class PostFiling extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -62,13 +63,16 @@
* 位置经度坐标
*/
@ApiModelProperty(value = "位置经度坐标")
- private String x;
+ private String lon;
/**
* 位置纬度坐标
*/
@ApiModelProperty(value = "位置纬度坐标")
- private String y;
+ private String lat;
+
+ //位置
+ private String position;
/**
* 上岗时间
@@ -84,30 +88,6 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date layoffTime;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建人")
- private Long createUser;
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
- private Date createTime;
-
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("更新人")
- private Long updateUser;
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("更新时间")
- private Date updateTime;
-
- /**
- * 是否已删除
- */
- @TableLogic
- @ApiModelProperty(value = "是否已删除")
- private Integer isDeleted;
}
diff --git a/src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.xml b/src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.xml
index b7512f5..54711e4 100644
--- a/src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.xml
+++ b/src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.xml
@@ -12,5 +12,6 @@
<if test="postFiling.name!=null and postFiling.name!=''">
and name like concat('%',#{postFiling.name},'%')
</if>
+ ORDER BY duty_time ASC
</select>
</mapper>
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 6d5cd99..e557af3 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -77,6 +77,7 @@
import org.springblade.modules.system.excel.*;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.*;
+import org.springblade.modules.system.vo.UserInfoDetail;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springblade.modules.training.entity.TrainingRegistration;
@@ -1384,4 +1385,13 @@
public R dataHandler() {
return R.data(userService.dataHandler());
}
+
+
+ //获取用户表和用户详情表的信息
+ @GetMapping("/getUserInfoDetail")
+ public R getUserInfoDetail(String id){
+ UserInfoDetail userInfoDetail = userService.getUserInfoDetail(id);
+ return R.data(userInfoDetail);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 3b5d29a..2dc90e2 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -28,6 +28,7 @@
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNode;
+import org.springblade.modules.system.vo.UserInfoDetail;
import org.springblade.modules.system.vo.UserVO;
import java.util.List;
@@ -317,4 +318,6 @@
* @return
*/
List<User> getNotGlList();
+
+ UserInfoDetail getUserInfoDetail(@Param("id") String id);
}
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 ed51ff6..52789bf 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -1147,6 +1147,12 @@
and bu.role_id = '1412226235153731586'
and bud.id is null
</select>
+ <select id="getUserInfoDetail" resultType="org.springblade.modules.system.vo.UserInfoDetail">
+ SELECT * FROM BLADE_USER bu
+ LEFT JOIN BLADE_USER_DETAIL BUD on bud.user_id = bu.id and bud.is_deleted = 0
+ WHERE bu.is_deleted = 0 and bu.id = #{id}
+
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index dc30736..7c449df 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -31,6 +31,7 @@
import org.springblade.modules.system.excel.SecurityYyExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.node.TreeNode;
+import org.springblade.modules.system.vo.UserInfoDetail;
import org.springblade.modules.system.vo.UserVO;
import java.util.List;
@@ -433,4 +434,6 @@
Object dataHandler();
Boolean wxRegister(User user);
+
+ UserInfoDetail getUserInfoDetail(String id);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 33aa4ac..34690fa 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -64,6 +64,7 @@
import org.springblade.modules.system.mapper.UserMapper;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.*;
+import org.springblade.modules.system.vo.UserInfoDetail;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
@@ -1910,4 +1911,9 @@
boolean save = save(user);
return save;
}
+
+ @Override
+ public UserInfoDetail getUserInfoDetail(String id) {
+ return baseMapper.getUserInfoDetail(id);
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/vo/UserInfoDetail.java b/src/main/java/org/springblade/modules/system/vo/UserInfoDetail.java
new file mode 100644
index 0000000..f9dff03
--- /dev/null
+++ b/src/main/java/org/springblade/modules/system/vo/UserInfoDetail.java
@@ -0,0 +1,63 @@
+package org.springblade.modules.system.vo;
+
+import lombok.Data;
+import org.springblade.modules.system.entity.User;
+
+@Data
+public class UserInfoDetail extends User {
+
+ private String unitName;
+
+ /**
+ * 婚姻状态
+ */
+ private Integer marriageStatus;
+ /**
+ * 报考等级
+ */
+ private Integer signLevel;
+ /**
+ * 户籍地址
+ */
+ private String permanentResidenceAddress;
+ /**
+ * 居住地址
+ */
+ private String dwellAddress;
+ /**
+ * 家庭主要成员及联系方式
+ */
+ private String memberOfFamily;
+ /**
+ * 工作经历
+ */
+ private String workExperience;
+ /**
+ * 教育经历
+ */
+ private String educationExperience;
+ /**
+ * 健康状况图片(健康证)
+ */
+ private String healthCertificateUrl;
+ /**
+ * 无犯罪记录图片
+ */
+ private String noCriminalRecordProveUrl;
+
+ /**
+ * 受理公安机关
+ */
+ private String acceptancePoliceUnit;
+
+ /**
+ * 受理人
+ */
+ private String acceptancePerson;
+
+ /**
+ * 受理时间
+ */
+ private String acceptanceTime;
+
+}
--
Gitblit v1.9.3