From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
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..936282d 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
@@ -35,13 +35,13 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.jfpt.attendance.excel.AttendanceExcel;
-import org.springblade.jfpt.attendance.util.PointMapUtil;
import org.springblade.jfpt.attendance.wrapper.AttendanceWrapper;
import org.springblade.jfpt.enclosure.entity.Enclosure;
import org.springblade.jfpt.enclosure.service.IEnclosureService;
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 +75,8 @@
private final IEnclosureService iEnclosureService;
private final IDictBizClient iDictBizService;
+
+ private final IUserClient iUserClient;
/**
* 详情
@@ -500,7 +502,7 @@
//判断是否在所在区域打卡，返回数据
if (onArea) {
//查询当前考勤人员的部门信息
-
+ attendance.setDepartment(iUserClient.selUserByCode(attendance.getNumber()).getDeptId());
//获取当前日期是礼拜几
attendance.setWeek(new SimpleDateFormat("EEEE").format(new Date()));
//获取打卡时间标准
--
Gitblit v1.9.3