From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 十二月 2023 09:16:29 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageSchedulingController.java | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageSchedulingController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageSchedulingController.java index 9fb040b..b7a6ba6 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageSchedulingController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageSchedulingController.java @@ -1,5 +1,7 @@ package com.dsh.course.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.entity.CoursePackageScheduling; import com.dsh.course.model.QueryCoursePackageSchedulingList; @@ -8,6 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -24,12 +29,13 @@ /** * 获取课包排课列表 + * * @param queryCoursePackageSchedulingList * @return */ @ResponseBody @PostMapping("/coursePackageScheduling/queryCoursePackageSchedulingList") - public Page<Map<String, Object>> queryCoursePackageSchedulingList(@RequestBody QueryCoursePackageSchedulingList queryCoursePackageSchedulingList){ + public Page<Map<String, Object>> queryCoursePackageSchedulingList(@RequestBody QueryCoursePackageSchedulingList queryCoursePackageSchedulingList) { Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryCoursePackageSchedulingList.getLimit(), queryCoursePackageSchedulingList.getOffset(), queryCoursePackageSchedulingList.getSort(), queryCoursePackageSchedulingList.getOrder()); Page<Map<String, Object>> mapPage = page.setRecords(coursePackageSchedulingService.queryCoursePackageSchedulingList(page, queryCoursePackageSchedulingList)); @@ -39,23 +45,52 @@ /** * 根据id获取数据 + * * @param id * @return */ @ResponseBody @PostMapping("/coursePackageScheduling/queryCoursePackageSchedulingById") - public CoursePackageScheduling queryCoursePackageSchedulingById(@RequestBody Long id){ + public CoursePackageScheduling queryCoursePackageSchedulingById(@RequestBody Long id) { return coursePackageSchedulingService.getById(id); + } + + + @ResponseBody + @PostMapping("/coursePackageScheduling/queryCoursePackageSchedulingsById") + public List<CoursePackageScheduling> queryCoursePackageSchedulingsById(@RequestBody Long id) { + CoursePackageScheduling byId = coursePackageSchedulingService.getById(id); + Date date = new Date(); // 假设你有一个 Date 对象 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String formattedDate = sdf.format(byId.getClassDate()); + List<CoursePackageScheduling> list = coursePackageSchedulingService.list(new LambdaQueryWrapper<CoursePackageScheduling>().eq(CoursePackageScheduling::getCoursePackageId, byId.getCoursePackageId()).eq(CoursePackageScheduling::getClassDate, formattedDate)); + return list; } /** * 编辑数据 + * * @param coursePackageScheduling */ @ResponseBody @PostMapping("/coursePackageScheduling/editCoursePackageScheduling") - public void editCoursePackageScheduling(@RequestBody CoursePackageScheduling coursePackageScheduling){ - coursePackageSchedulingService.updateById(coursePackageScheduling); + public void editCoursePackageScheduling(@RequestBody List<CoursePackageScheduling> coursePackageScheduling) { +// coursePackageScheduling.setCoursePackageId(null); + for (CoursePackageScheduling packageScheduling : coursePackageScheduling) { + packageScheduling.setCoursePackageId(null); + } + coursePackageSchedulingService.updateBatchById(coursePackageScheduling); + } + + /** + * 新增数据 + * + * @param coursePackageScheduling + */ + @ResponseBody + @PostMapping("/coursePackageScheduling/saveCoursePackageScheduling") + public void addCoursePackageScheduling(@RequestBody CoursePackageScheduling coursePackageScheduling) { + coursePackageSchedulingService.save(coursePackageScheduling); } } -- Gitblit v1.7.1