活动详情接口新增：8进行中

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";
 }

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)) {

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);
 }