From 65dcc6005708dc6cd8dc4402d145192b1928eee5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 14:49:24 +0800
Subject: [PATCH] 1.考勤打卡接口修改,插入部门数据 2.导出数据列去除天气
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/excel/AttendanceExcel.java | 6 ++++--
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/attendance/controller/AttendanceController.java | 5 ++++-
2 files changed, 8 insertions(+), 3 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..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)
--
Gitblit v1.9.3