增加接口，获取 已报名的活动时间段

esua-epdc/epdc-gateway/pom.xml

@@ -105,8 +105,8 @@
                 <!--<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
                 </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-<!--                                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
+                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
+                                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
 <!--                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>-->

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

@@ -208,4 +208,18 @@ public class ApiActUserRelationController {
     public Result<List<ActPeriodDTO>> getActPeriods(String actId) {
         return actUserRelationService.listOfActPeriods(actId);
     }
+
+    /**
+     * 获取 已报名的活动时间段
+     *
+     * @param tokenDto
+     * @param actId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>>
+     * @author zy
+     * @since 2021/9/3 15:54
+     */
+    @GetMapping("getSignInActPeriods")
+    public Result<List<ActPeriodDTO>> getSignInActPeriods(@LoginUser TokenDto tokenDto, String actId) {
+        return actUserRelationService.listOfSignInActPeriods(tokenDto.getUserId(), actId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java

@@ -82,4 +82,16 @@ public interface AppActUserRelationFeignClient {
      */
     @GetMapping(value = "heart/appactuserrelation/getActPeriods/{actId}",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<List<ActPeriodDTO>> getActPeriods(@PathVariable("actId") String actId);
+
+    /**
+     * 获取 已报名的活动时间段
+     *
+     * @param userId
+     * @param actId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>>
+     * @author zy
+     * @since 2021/9/3 15:54
+     */
+    @GetMapping(value = "heart/appactuserrelation/getSignInActPeriods/{userId}/{actId}",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<ActPeriodDTO>> getSignInActPeriods(@PathVariable("userId") String userId, @PathVariable("actId") String actId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java

@@ -52,4 +52,8 @@ public class AppActUserRelationFeignClientFallback implements AppActUserRelation
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getActPeriods", actId);
     }
 
+    @Override
+    public Result<List<ActPeriodDTO>> getSignInActPeriods(String userId, String actId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getSignInActPeriods", userId, actId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java

@@ -70,4 +70,15 @@ public interface ActUserRelationService {
      * @since 2021/9/3 15:55
      */
     Result<List<ActPeriodDTO>> listOfActPeriods(String actId);
+
+    /**
+     * 获取 已报名的活动时间段
+     *
+     * @param userId
+     * @param actId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>>
+     * @author zy
+     * @since 2021/9/3 15:54
+     */
+    Result<List<ActPeriodDTO>> listOfSignInActPeriods(String userId, String actId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java

@@ -65,4 +65,8 @@ public class ActUserRelationServiceImpl implements ActUserRelationService {
         return actInfoFeignClient.getActPeriods(actId);
     }
 
+    @Override
+    public Result<List<ActPeriodDTO>> listOfSignInActPeriods(String userId, String actId) {
+        return actInfoFeignClient.getSignInActPeriods(userId, actId);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java

@@ -108,4 +108,18 @@ public class AppActUserRelationController {
         return new Result<List<ActPeriodDTO>>().ok(data);
     }
 
+    /**
+     * 获取 已报名的活动时间段
+     *
+     * @param userId
+     * @param actId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>>
+     * @author zy
+     * @since 2021/9/3 15:54
+     */
+    @GetMapping("getSignInActPeriods/{userId}/{actId}")
+    public Result<List<ActPeriodDTO>> getSignInActPeriods(@PathVariable("userId") String userId,@PathVariable("actId") String actId) {
+        List<ActPeriodDTO> data = actUserRelationService.listOfSignInActPeriods(userId, actId);
+        return new Result<List<ActPeriodDTO>>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.activity.dao;
 
 import com.elink.esua.epdc.activity.ActClockListDTO;
 import com.elink.esua.epdc.activity.ActClockPicDTO;
+import com.elink.esua.epdc.activity.ActPeriodDTO;
 import com.elink.esua.epdc.activity.ActUserRelationDTO;
 import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO;
 import com.elink.esua.epdc.activity.result.ActUserClockResultDTO;
@@ -125,4 +126,15 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
      * @return java.util.List<com.elink.esua.epdc.activity.ActClockListDTO>
      **/
     List<ActClockListDTO> selectListV2ActUserRelation(EpdcClockListV2FormDTO formDTO);
+
+    /**
+     * 获取 已报名的活动时间段
+     *
+     * @param userId
+     * @param actId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>>
+     * @author zy
+     * @since 2021/9/3 15:54
+     */
+    List<ActPeriodDTO> selectListOfSignInActPeriods(@Param("userId") String userId, @Param("actId") String actId);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java

@@ -194,4 +194,15 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
      * @since 2021/9/3 16:00
      */
     List<ActPeriodDTO> listOfActPeriods(String actId);
+
+    /**
+     * 获取 已报名的活动时间段
+     *
+     * @param userId
+     * @param actId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>>
+     * @author zy
+     * @since 2021/9/3 15:54
+     */
+    List<ActPeriodDTO> listOfSignInActPeriods(String userId, String actId);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java

@@ -674,4 +674,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         return actPeriodService.listOfActPeriodsByActId(actId);
     }
 
+    @Override
+    public List<ActPeriodDTO> listOfSignInActPeriods(String userId, String actId) {
+        return baseDao.selectListOfSignInActPeriods(userId, actId);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml

@@ -302,4 +302,20 @@
         order by auc.CLOCK_TIME desc
         LIMIT #{pageIndex}, #{pageSize}
     </select>
+
+    <select id="selectListOfSignInActPeriods" resultType="com.elink.esua.epdc.activity.ActPeriodDTO">
+        SELECT
+            p.ID,
+            p.ACT_ID,
+            p.ACT_PERIOD_START_TIME,
+            p.ACT_PERIOD_END_TIME
+        FROM epdc_act_user_relation r
+        LEFT JOIN epdc_act_period_user pu ON r.ID = pu.ACT_USER_RELATION_ID AND pu.DEL_FLAG ='0' AND pu.PERIOD_STATUS = '0'
+        LEFT JOIN epdc_act_period p ON pu.ACT_PERIOD_ID = p.ID AND p.DEL_FLAG = '0'
+        WHERE r.DEL_FLAG = '0'
+        AND r.USER_ID = #{userId}
+        AND r.ACT_ID = #{actId}
+        AND r.`STATUS` IN ('0', '1')
+        ORDER BY P.ACT_PERIOD_START_TIME
+    </select>
 </mapper>