From c8f3e3aefba3a155668036ab2c86da5b9d2fa8ff Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 14 Oct 2024 17:27:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=84=E8=AE=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClassExamController.java | 2 +- .../controller/CourseGuestbookController.java | 37 ++++++++++++++++++- .../service/CourseGuestbookService.java | 4 -- .../impl/CourseGuestbookServiceImpl.java | 25 ------------- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/controller/ClassExamController.java b/src/main/java/com/peanut/modules/common/controller/ClassExamController.java index 837d7ef2..ac86aede 100644 --- a/src/main/java/com/peanut/modules/common/controller/ClassExamController.java +++ b/src/main/java/com/peanut/modules/common/controller/ClassExamController.java @@ -201,7 +201,7 @@ public class ClassExamController { public R submitExamPaper(@RequestBody Map params){ ClassExamUser classExamUser = classExamService.submitExamPaper(params); //自考的人成绩达标，发放证书 - if ("2".equals(classExamUser.getType())&&classExamUser.getScore()>=80){ + if ("2".equals(classExamUser.getType())&&classExamUser.getScore()>=60){ UserCertificate userCertificate = new UserCertificate(); userCertificate.setType("ZK"); userCertificate.setUserId(ShiroUtils.getUId()); diff --git a/src/main/java/com/peanut/modules/master/controller/CourseGuestbookController.java b/src/main/java/com/peanut/modules/master/controller/CourseGuestbookController.java index dc26698b..6828aaf9 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseGuestbookController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseGuestbookController.java @@ -1,14 +1,20 @@ package com.peanut.modules.master.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.R; import com.peanut.modules.common.entity.CourseGuestbook; import com.peanut.modules.master.service.CourseGuestbookService; +import com.peanut.modules.master.service.MyUserService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import java.util.List; import java.util.Map; @Slf4j @@ -18,11 +24,38 @@ public class CourseGuestbookController { @Autowired private CourseGuestbookService service; + @Autowired + private MyUserService userService; @RequestMapping("/getCourseGuestbookList") public R getCourseGuestbookList(@RequestBody Map map){ - Page courseGuestbookList = service.getCourseGuestbookList(map); - return R.ok().put("page",courseGuestbookList); + Integer limit = Integer.valueOf(map.get("limit").toString()); + Integer page = Integer.valueOf(map.get("page").toString()); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.eq(CourseGuestbook::getType,map.get("type")); + if (StringUtils.isNotEmpty(map.get("courseId").toString())){ + wrapper.eq(CourseGuestbook::getCourseId,map.get("courseId")); + } + if (StringUtils.isNotEmpty(map.get("chapterId").toString())){ + wrapper.eq(CourseGuestbook::getChapterId,map.get("chapterId")); + } + wrapper.eq(CourseGuestbook::getPid,0); + wrapper.like(CourseGuestbook::getContent,map.get("content")); + wrapper.orderByAsc(CourseGuestbook::getCreateTime); + Page courseGuestbookPage = service.page(new Page<>(page, limit), wrapper); + if (courseGuestbookPage != null&&courseGuestbookPage.getRecords().size() > 0){ + for (CourseGuestbook courseGuestbook : courseGuestbookPage.getRecords()) { + courseGuestbook.setUser(userService.getById(courseGuestbook.getUserId())); + List childs = service.list(new LambdaQueryWrapper() + .eq(CourseGuestbook::getPid,courseGuestbook.getId()) + .orderByAsc(CourseGuestbook::getCreateTime)); + for (CourseGuestbook childC : childs) { + childC.setUser(userService.getById(courseGuestbook.getUserId())); + } + courseGuestbook.setChildren(childs); + } + } + return R.ok().put("page",courseGuestbookPage); } @RequestMapping("/addCourseGuestbook") diff --git a/src/main/java/com/peanut/modules/master/service/CourseGuestbookService.java b/src/main/java/com/peanut/modules/master/service/CourseGuestbookService.java index 804d9e37..22ae91c9 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseGuestbookService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseGuestbookService.java @@ -7,8 +7,4 @@ import com.peanut.modules.common.entity.CourseGuestbook; import java.util.Map; public interface CourseGuestbookService extends IService { - - Page getCourseGuestbookList(Map map); - - } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseGuestbookServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseGuestbookServiceImpl.java index b84558c8..f95727d9 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseGuestbookServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseGuestbookServiceImpl.java @@ -15,29 +15,4 @@ import java.util.Map; @Slf4j @Service("masterCourseGuestbookService") public class CourseGuestbookServiceImpl extends ServiceImpl implements CourseGuestbookService { - - @Override - public Page getCourseGuestbookList(Map map) { - Integer limit = Integer.valueOf(map.get("limit").toString()); - Integer page = Integer.valueOf(map.get("page").toString()); - MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); - wrapper.eq(CourseGuestbook::getType,map.get("type")); - if (StringUtils.isNotEmpty(map.get("courseId").toString())){ - wrapper.eq(CourseGuestbook::getCourseId,map.get("courseId")); - } - if (StringUtils.isNotEmpty(map.get("chapterId").toString())){ - wrapper.eq(CourseGuestbook::getChapterId,map.get("chapterId")); - } - wrapper.eq(CourseGuestbook::getPid,0); - wrapper.like(CourseGuestbook::getContent,map.get("content")); - wrapper.orderByAsc(CourseGuestbook::getCreateTime); - Page courseGuestbookPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper); - if (courseGuestbookPage != null&&courseGuestbookPage.getRecords().size() > 0){ - for (CourseGuestbook courseGuestbook : courseGuestbookPage.getRecords()) { - courseGuestbook.setChildren(this.list(new LambdaQueryWrapper().eq(CourseGuestbook::getPid,courseGuestbook.getId()).orderByAsc(CourseGuestbook::getCreateTime))); - } - } - return courseGuestbookPage; - } - }