Просмотр исходного кода

日程计划出参添加课程计划id

肖玮 5 лет назад
Родитель
Сommit
4d61e39cc1

+ 2 - 2
mec-education/src/main/java/com/ym/mec/education/req/TeacherReq.java

@@ -4,7 +4,7 @@ import com.ym.mec.education.base.BaseQuery;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
-import java.util.Date;
+import java.time.LocalDate;
 
 /**
  * @version V1.0
@@ -21,5 +21,5 @@ public class TeacherReq extends BaseQuery {
     private Integer userId;
 
     @ApiModelProperty(value = "日程安排时间")
-    private Date date;
+    private LocalDate date;
 }

+ 2 - 0
mec-education/src/main/java/com/ym/mec/education/resp/TeacherDailyScheduleResp.java

@@ -31,4 +31,6 @@ public class TeacherDailyScheduleResp implements Serializable {
     private String classTime;
     @ApiModelProperty(value = "学校名称")
     private String schoolName;
+    @ApiModelProperty(value = "课程计划id")
+    private Long courseScheduleId;
 }

+ 3 - 2
mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.java

@@ -325,13 +325,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
         Page<CourseSchedule> courseSchedulePage = new Page<>(req.getPageNo(), req.getPageSize());
         QueryWrapper<CourseSchedule> courseScheduleQueryWrapper = new QueryWrapper<>();
         courseScheduleQueryWrapper.lambda().eq(CourseSchedule::getTeacherId, req.getUserId())
-            .eq(Objects.isNull(req.getDate()), CourseSchedule::getClassDate, req.getDate());
+        .eq(Objects.nonNull(req.getDate()), CourseSchedule::getClassDate, req.getDate());
         IPage<CourseSchedule> page = courseScheduleService.page(courseSchedulePage, courseScheduleQueryWrapper);
         BeanUtils.copyProperties(page, pageResult);
         if (!CollectionUtils.isEmpty(page.getRecords())) {
             page.getRecords().forEach(courseSchedule -> {
                 TeacherDailyScheduleResp teacherDailyScheduleResp = new TeacherDailyScheduleResp();
-                teacherDailyScheduleResp.setCourseName(courseSchedule.getName())
+                teacherDailyScheduleResp.setCourseScheduleId(courseSchedule.getId())
+                    .setCourseName(courseSchedule.getName())
                     .setCourseType(CourseSchedule.CourseScheduleType.getMsgByCode(courseSchedule.getType()));
                 if (Objects.nonNull(courseSchedule.getStartClassTime()) && Objects.nonNull(courseSchedule.getEndClassTime())) {
                     teacherDailyScheduleResp.setClassTime(DateUtil.time2String(courseSchedule.getStartClassTime()) + "-" +