From 14ffb4017e9c6fe8e649b3d17ce743ed05c5aa5c Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 10 Mar 2021 16:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E5=9B=BE=E7=89=87=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActUserClockLogServiceImpl.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 f20239d4..13e2efa4 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
@@ -334,6 +334,15 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
      */
     @Override
     public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
+        //判断当前时间是否超过打卡范围时间
+        ActInfoEntity actInfoEntity = actInfoService.selectById(appActUserClockLogDTO.getActId());
+        if(!(new Date().before(actInfoEntity.getSigninEndTime()) && new Date().after(actInfoEntity.getSigninStartTime()))){
+            return new Result().error("当前时间超过打卡时间范围");
+        }
+        //判断是否上传图片
+        if(appActUserClockLogDTO.getImages()==null || appActUserClockLogDTO.getImages().size()==0){
+            return new Result().error("请上传打卡图片");
+        }
         //内容审核 - start
         Boolean isConReview = appActUserClockLogDTO.getIsConReview();
         String mobile = null;
@@ -357,11 +366,6 @@ 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);