From 85898fe2cb1e0b78d722955908e06f61b811a3fc Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 5 Feb 2020 19:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E=EF=BC=9A8=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/constant/ActUserStatusConstant.java      | 10 +++++++---
 .../activity/service/impl/ActInfoServiceImpl.java      |  4 ++--
 .../esua/epdc/modules/feign/UserInfoFeignClient.java   |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java
index b972d397e..99c835d8c 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java
@@ -34,14 +34,18 @@ public interface ActUserStatusConstant {
 	/**
 	 * 更新打卡
 	 */
-	String UPDATE_CLOCK="5";
+	String UPDATE_CLOCK = "5";
 	/**
 	 * 已结束
 	 */
-	String FINISHED="6";
+	String FINISHED = "6";
 	/**
 	 * 已取消
 	 */
-	String CANCELED="7";
+	String CANCELED = "7";
 
+	/**
+	 * 进行中
+	 */
+	String ON_GOING = "8";
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index a6054cd8f..1112b6da0 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -286,11 +286,11 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             }
         } else if (currentTime.after(actInfoEntity.getSigninStartTime()) && currentTime.before(actInfoEntity.getSigninEndTime())) {
             /*活动打卡时间段内：
-            1、当前用户未报名 不显示
+            1、当前用户未报名 不显示:进行中
             2、当前用户已报名且未打卡  我要打卡
             3、当前用户已报名且已打卡  更新打卡*/
             if (null == actUserRelationEntity) {
-
+                currentUserStatus = ActUserStatusConstant.ON_GOING;
             } else if (null != actUserRelationEntity
                     && actUserRelationEntity.getStatus().equals("1")
                     && CollUtil.isEmpty(actUserClockLogList)) {
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java
index 0e433437e..246f0cfb9 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java
@@ -41,6 +41,6 @@ public interface UserInfoFeignClient {
      * @Description 根据用户主键获取用户志愿者标识（0-未认证1-已认证）
      * @Date 2020/2/5 16:45
      **/
-    @PostMapping("app-user/volunteerinfo/queryUserVolunteerFlag/{userId}")
+    @GetMapping("app-user/volunteerinfo/queryUserVolunteerFlag/{userId}")
     Result<String> queryUserVolunteerFlag(@PathVariable("userId") String userId);
 }