过滤已取消的报名

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

@@ -47,16 +47,6 @@ public interface ActPeriodUserDao extends BaseDao<ActPeriodUserEntity> {
      */
     List<ActPeriodDTO> selectListOfSignInActPeriodsByActUserRelationId(String actUserRelationId);
 
-    /**
-     * 获取用户报名时间段，且该时间段：未被取消、未被拒绝
-     *
-     * @param actUserRelationId
-     * @return java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>
-     * @author lc
-     * @since 2021/9/2 20:05
-     */
-    List<ActPeriodDTO> listOfNormalSignInActPeriodsByActUserRelationId1(String actUserRelationId);
-
     /**
      * 删除参与活动时间段记录
      *

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

@@ -105,16 +105,6 @@ public interface ActPeriodUserService extends BaseService<ActPeriodUserEntity> {
      */
     List<ActPeriodDTO> listOfSignInActPeriodsByActUserRelationId(String actUserRelationId);
 
-    /**
-     * 获取用户报名时间段，且该时间段：未被取消、未被拒绝
-     *
-     * @param actUserRelationId
-     * @return java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>
-     * @author lc
-     * @since 2021/9/2 20:05
-     */
-    List<ActPeriodDTO> listOfNormalSignInActPeriodsByActUserRelationId1(String actUserRelationId);
-
     /**
      * 删除参与活动时间段记录
      *

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

@@ -103,11 +103,6 @@ public class ActPeriodUserServiceImpl extends BaseServiceImpl<ActPeriodUserDao,
         return baseDao.selectListOfSignInActPeriodsByActUserRelationId(actUserRelationId);
     }
 
-    @Override
-    public List<ActPeriodDTO> listOfNormalSignInActPeriodsByActUserRelationId1(String actUserRelationId) {
-        return baseDao.listOfNormalSignInActPeriodsByActUserRelationId1(actUserRelationId);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void removeActPeriodUserByActUserRelationId(String actUserRelationId) {

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

@@ -337,7 +337,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
                 actPeriodUserService.updateBatch(periodUserDtoList);
 
                 // 查询状态为：已报名的所有时间段
-                List<ActPeriodDTO> periodTime = actPeriodUserService.listOfNormalSignInActPeriodsByActUserRelationId1(actUserRelationEntity.getId());
+                List<ActPeriodDTO> periodTime = actPeriodUserService.listOfSignInActPeriodsByActUserRelationId(actUserRelationEntity.getId());
                 if (null == periodTime) {
                     periodTime = new ArrayList<>();
                 }

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

@@ -30,34 +30,7 @@
                 AND pu.DEL_FLAG = '0'
                 LEFT JOIN epdc_act_period p ON p.ID = pu.ACT_PERIOD_ID
                 AND p.DEL_FLAG = '0'
-        ORDER BY actPeriodStartTime
-    </select>
-
-    <select id="listOfNormalSignInActPeriodsByActUserRelationId1" resultType="com.elink.esua.epdc.activity.ActPeriodDTO">
-        SELECT
-            CASE
-                WHEN
-                    p.ACT_PERIOD_START_TIME IS NULL THEN
-                    t.ACT_START_TIME ELSE p.ACT_PERIOD_START_TIME
-                END AS actPeriodStartTime,
-            CASE
-                WHEN p.ACT_PERIOD_END_TIME IS NULL THEN
-                    t.ACT_END_TIME ELSE p.ACT_PERIOD_END_TIME
-                END AS actPeriodEndTime
-        FROM
-        (
-            SELECT
-                ur.ID,
-                ai.ACT_START_TIME,
-                ai.ACT_END_TIME
-            FROM
-                epdc_act_user_relation ur
-                LEFT JOIN epdc_act_info ai ON ai.ID = ur.ACT_ID
-            WHERE ur.ID = #{actUserRelationId}
-        ) t
-        LEFT JOIN epdc_act_period_user pu ON pu.ACT_USER_RELATION_ID = t.ID AND pu.DEL_FLAG = '0'
-        LEFT JOIN epdc_act_period p ON p.ID = pu.ACT_PERIOD_ID AND p.DEL_FLAG = '0'
-        WHERE  IFNULL(pu.PERIOD_STATUS , '0')NOT IN ('3','4')
+        WHERE IFNULL(pu.PERIOD_STATUS , '0') NOT IN ('3','4')
         ORDER BY actPeriodStartTime
     </select>