吴树波 5 days ago
parent
commit
1ff1084912

+ 5 - 0
fs-service-system/src/main/java/com/fs/course/domain/FsUserCoursePeriodDays.java

@@ -38,6 +38,11 @@ public class FsUserCoursePeriodDays extends BaseEntityTow {
     @Excel(name = "第几节课")
     private Integer lesson;
 
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalDate dayDate;
+
     /** 开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")

+ 3 - 1
fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodDaysServiceImpl.java

@@ -116,12 +116,14 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
         }else{
             days = DateUtil.differenceTime(period.getPeriodStartingTime(), period.getPeriodEndTime(), TimeTypeEnum.DAY);
         }
+        days++;
         if(num + entity.getVideoIds().size() > days) return R.error("课程不能超过营期范围");
-        AtomicInteger i = new AtomicInteger(1);
+        AtomicInteger i = new AtomicInteger(0);
         List<FsUserCoursePeriodDays> collect = entity.getVideoIds().stream().map(e -> {
             FsUserCoursePeriodDays day = new FsUserCoursePeriodDays();
             day.setPeriodId(entity.getPeriodId());
             day.setLesson(num + i.getAndIncrement());
+            day.setDayDate(period.getPeriodStartingTime().plusDays(day.getLesson()));
             day.setCourseId(entity.getCourseId());
             day.setVideoId(e);
             day.setCreateTime(new Date());