活动日历

cloud-training-project-service/src/main/java/com/yizhi/training/application/mapper/TrainingProjectMapper.xml

@@ -284,8 +284,9 @@
     </select>
 
     <select id="apiPageListCount" resultType="com.yizhi.training.application.vo.domain.TrainingProjectVo">
-        select  tb.start_time as startTime,tb.end_time as endTime
+        select  en.start_time as startTime,en.end_time as endTime
         from training_project tb
+        left join tr_enroll en on tb.id = en.training_project_id
         where
         -- 首先用站点 id 和上架状态缩小范围
         (tb.site_id = #{siteId} and tb.status = 1 and tb.deleted = 0 )

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TrainingProjectServiceImpl.java

@@ -1528,12 +1528,15 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
         if(!CollectionUtils.isEmpty(trainingProjectVos)){
             List<String> list = new ArrayList<String>(1);
             trainingProjectVos.stream().forEach(trainingProjectVo -> {
-                List<String> dateList = LegacyDateUtils.getDatesBetween(trainingProjectVo.getStartTime(),trainingProjectVo.getEndTime());
-                dateList.stream().forEach(date->{
-                    if(!list.contains(date)){
-                        list.add(date);
-                    }
-                });
+                if(trainingProjectVo!=null&&trainingProjectVo.getStartTime()!=null&&trainingProjectVo.getEndTime()!=null){
+                    List<String> dateList = LegacyDateUtils.getDatesBetween(trainingProjectVo.getStartTime(),trainingProjectVo.getEndTime());
+                    dateList.stream().forEach(date->{
+                        if(!list.contains(date)){
+                            list.add(date);
+                        }
+                    });
+                }
+
             });
             item.setTheDay(list);