From aa6b104c605a097031862bb0acf622de121729ab Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 25 Apr 2021 15:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=BA=94=E6=97=A9=E4=BA=8E=E7=AD=BE=E5=88=B0=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4=EF=BC=8C=E6=9C=AA=E5=88=B0=E7=AD=BE?=
 =?UTF-8?q?=E5=88=B0=E6=97=B6=E9=97=B4=EF=BC=8C=E7=AD=BE=E5=88=B0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/act/service/impl/ActSignInRecordServiceImpl.java  | 4 ++++
 .../modules/act/service/impl/GroupActInfoServiceImpl.java     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
index 86b6b575eb..ff43932db9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
@@ -125,6 +125,10 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
         } catch (Exception e) {
             throw new RenException("签到起止时间格式错误");
         }
+        if(groupActInfoEntity.getSignInEndTime().getTime()<groupActInfoEntity.getSignInStartTime().getTime()){
+            log.warn("签到截止时间应晚于签到开始时间");
+            throw new RenException(EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getCode(),EpmetErrorCode.ACT_SIGN_IN_START_TIME_ERROR.getMsg());
+        }
         groupActInfoDao.updateById(groupActInfoEntity);
         SetSignTimeResultDTO result = new SetSignTimeResultDTO();
         result.setGroupActId(formDTO.getGroupActId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 80760fbe63..0274790383 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -563,7 +563,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         long signInStartTime=resultDTO.getSignInStartTime().getTime();
         long signInEndTime=resultDTO.getSignInEndTime().getTime();
         if (nowTime < signInStartTime) {
-            resultDTO.setSignInButton(GroupActConstant.DISPLAY);
+            resultDTO.setSignInButton(GroupActConstant.BLANK);
             // 2、未到签到时间显示距离签到时间还有多久
             //距离签到开始还有XX天4小时32分钟
             String remainStr=getDatePoor(resultDTO.getSignInStartTime(),nowDate);