From 5ed8bac0544a2f54627fe24f7a1d3de9fe9e5257 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 15 Oct 2020 11:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActUserClockLogServiceImpl.java         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index db39fe80..53fa264e 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -38,7 +38,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckReco
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO;
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.constant.ActUserRelationStatusConstant;
@@ -51,6 +50,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.result.BehaviorResultDto;
 import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao;
+import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
 import com.elink.esua.epdc.modules.activity.service.*;
@@ -338,8 +338,11 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
         //内容审核 - end
-
-
+        //判断当前时间是否超过打卡范围时间
+        ActInfoEntity actInfoEntity = actInfoService.selectById(appActUserClockLogDTO.getActId());
+        if(!(new Date().before(actInfoEntity.getSigninEndTime()) && new Date().after(actInfoEntity.getSigninStartTime()))){
+            return new Result().error("当前时间超过打卡时间范围");
+        }
         //查询人员活动关系Id(可打卡的)
         List<String> statusList = new ArrayList<>();
         statusList.add(ActUserRelationStatusConstant.APPROVED);