From 977444532d644d48b5b55ca89a1e3d62b5dd8782 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 19 May 2021 17:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml | 2
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 10 +++++
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 5 ++
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java | 8 ++++
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java | 7 +++
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java | 1
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java | 6 ++-
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java | 8 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java | 5 ++
blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java | 10 +++++
10 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
index 1b94de8..8ffc3a8 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
@@ -87,6 +87,7 @@
/**
* 部门id
*/
+ @TableField("dept_id")
private String deptId;
/**
* 岗位id
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
index 875c19d..c22e1b9 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
@@ -46,6 +46,7 @@
String USER_AUTH_INFO = API_PREFIX + "/user-auth-info";
String SAVE_USER = API_PREFIX + "/save-user";
String REMOVE_USER = API_PREFIX + "/remove-user";
+ String SELUSERBYCODE = API_PREFIX + "/selUserByCode";
/**
* 获取用户信息
@@ -115,4 +116,11 @@
@PostMapping(REMOVE_USER)
R<Boolean> removeUser(@RequestParam("tenantIds") String tenantIds);
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ @GetMapping(SELUSERBYCODE)
+ User selUserByCode(@RequestParam("code") String code);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java
index 8c59ddf..4d93dd0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java
@@ -42,6 +42,7 @@
import org.springblade.system.entity.DictBiz;
import org.springblade.system.feign.IDictBizClient;
import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
import org.springblade.system.user.vo.UserVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -75,6 +76,8 @@
private final IEnclosureService iEnclosureService;
private final IDictBizClient iDictBizService;
+
+ private final IUserClient iUserClient;
/**
* 详情
@@ -500,7 +503,7 @@
//判断是否在所在区域打卡，返回数据
if (onArea) {
//查询当前考勤人员的部门信息
-
+ attendance.setDepartment(iUserClient.selUserByCode(attendance.getNumber()).getDeptId());
//获取当前日期是礼拜几
attendance.setWeek(new SimpleDateFormat("EEEE").format(new Date()));
//获取打卡时间标准
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java
index 50697bb..3f25669 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java
@@ -51,8 +51,10 @@
@ExcelProperty("部门")
private String department;
- @ColumnWidth(10)
- @ExcelProperty("天气")
+ /**
+ * 天气，忽略不显示
+ */
+ @ExcelIgnore
private String weather;
@ColumnWidth(20)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml
index 9e7cbff..5563832 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml
@@ -26,7 +26,7 @@
<select id="getValue" resultType="java.lang.String">
select
dict_value
- from blade_dict_biz where code = #{param1} and dict_key = #{param2} and is_deleted = 0
+ from blade_dict_biz where code = #{param1} and dict_key = #{param2} and is_deleted = 0 limit 1
</select>
<!-- oracle 版本 -->
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
index 3e790ef..c6ae78d 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
@@ -85,4 +85,14 @@
return R.data(service.remove(Wrappers.<User>query().lambda().in(User::getTenantId, Func.toStrList(tenantIds))));
}
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ @Override
+ @GetMapping(SELUSERBYCODE)
+ public User selUserByCode(String code) {
+ return service.selUserByCode(code);
+ }
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
index 42c5e99..9f355db 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
@@ -23,7 +23,6 @@
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.vo.UsersVo;
-
import java.util.List;
/**
@@ -77,4 +76,11 @@
* @param page 分页
*/
List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
+
+ /**
+ * 根据用户编号查询用户信息
+ * @param code 用户编号
+ * @return
+ */
+ User selUserByCode(String code);
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index f902ee9..45f8c7a 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -170,4 +170,9 @@
</if>
order by bu.code asc
</select>
+
+ <!--根据用户编号查询用户信息-->
+ <select id="selUserByCode" resultType="org.springblade.system.user.entity.User">
+ select code,dept_id deptId from blade_user where is_deleted = 0 and code=#{code}
+ </select>
</mapper>
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
index b325bb2..375f074 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -213,4 +213,11 @@
* @return
*/
IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user);
+
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ User selUserByCode(String code);
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 1edc9f8..e8e2714 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -419,4 +419,14 @@
public IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user) {
return page.setRecords(baseMapper.selectSecurityUserPageList(page,user));
}
+
+ /**
+ * 根据用户编号查询用户新
+ * @param code 用户编号
+ * @return
+ */
+ @Override
+ public User selUserByCode(String code) {
+ return baseMapper.selUserByCode(code);
+ }
}
--
Gitblit v1.9.3