首页活动取消控制：当前时间是否在活动范围内。显示未结束的所有活动，包含没开始的活动

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -205,9 +205,9 @@ public class SysHomeController {
             Date startDate = activity.getStartDate();
             Date endDate = activity.getEndDate();
             // 判断当前时间是否在活动范围内，不在就过滤掉
-            if (!DateUtil.isIn(today, startDate, endDate)) {
+//            if (!DateUtil.isIn(today, startDate, endDate)) {
-                continue;
+//                continue;
-            }
+//            }
 			// 只过滤结束的
 			if (DateUtil.compare(today, endDate) > 0) {
 				continue;

src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/list/index.html

@@ -56,7 +56,7 @@ layout("/layouts/platform_h5.html"){
             </table-column>
         </template>
         <template #actions="{index,row}">
-            <template v-if="$moment().isBefore($moment(row.choiceTimeEnd))">
+            <template v-if="$moment(row.choiceTimeStart).isBefore($moment()) && $moment().isBefore($moment(row.choiceTimeEnd))">
                 <div class="action-btn" style="text-align: right" @click="onView(row)">
                     <i class="fa fa-edit"></i>
                     <span>去报名</span>