成功返回实体添加user
修改排序
This commit is contained in:
@@ -5,6 +5,7 @@ import com.peanut.common.utils.R;
|
|||||||
import com.peanut.modules.common.entity.CourseGuestbook;
|
import com.peanut.modules.common.entity.CourseGuestbook;
|
||||||
import com.peanut.modules.common.entity.CourseGuestbookSupport;
|
import com.peanut.modules.common.entity.CourseGuestbookSupport;
|
||||||
import com.peanut.modules.common.service.CourseGuestbookService;
|
import com.peanut.modules.common.service.CourseGuestbookService;
|
||||||
|
import com.peanut.modules.common.service.MyUserService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
@@ -20,6 +21,8 @@ public class CourseGuestbookController {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private CourseGuestbookService service;
|
private CourseGuestbookService service;
|
||||||
|
@Autowired
|
||||||
|
private MyUserService userService;
|
||||||
|
|
||||||
@RequestMapping("/getCourseGuestbookList")
|
@RequestMapping("/getCourseGuestbookList")
|
||||||
public R getCourseGuestbookList(@RequestBody Map<String,Object> map){
|
public R getCourseGuestbookList(@RequestBody Map<String,Object> map){
|
||||||
@@ -30,7 +33,9 @@ public class CourseGuestbookController {
|
|||||||
@RequestMapping("/addCourseGuestbook")
|
@RequestMapping("/addCourseGuestbook")
|
||||||
public R addCourseGuestbook(@RequestBody CourseGuestbook courseGuestbook){
|
public R addCourseGuestbook(@RequestBody CourseGuestbook courseGuestbook){
|
||||||
service.save(courseGuestbook);
|
service.save(courseGuestbook);
|
||||||
return R.ok().put("courseGuestbook",service.getById(courseGuestbook.getId()));
|
CourseGuestbook res = service.getById(courseGuestbook.getId());
|
||||||
|
res.setUser(userService.getById(res.getUserId()));
|
||||||
|
return R.ok().put("courseGuestbook",res);
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/addCourseGuestbookSupport")
|
@RequestMapping("/addCourseGuestbookSupport")
|
||||||
|
|||||||
@@ -41,14 +41,14 @@ public class CourseGuestbookServiceImpl extends ServiceImpl<CourseGuestbookDao,
|
|||||||
wrapper.eq(CourseGuestbook::getChapterId,map.get("chapterId"));
|
wrapper.eq(CourseGuestbook::getChapterId,map.get("chapterId"));
|
||||||
}
|
}
|
||||||
wrapper.eq(CourseGuestbook::getPid,0);
|
wrapper.eq(CourseGuestbook::getPid,0);
|
||||||
wrapper.orderByAsc(CourseGuestbook::getCreateTime);
|
wrapper.orderByDesc(CourseGuestbook::getCreateTime);
|
||||||
Page<CourseGuestbook> courseGuestbookPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
|
Page<CourseGuestbook> courseGuestbookPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
|
||||||
if (courseGuestbookPage != null&&courseGuestbookPage.getRecords().size() > 0){
|
if (courseGuestbookPage != null&&courseGuestbookPage.getRecords().size() > 0){
|
||||||
for (CourseGuestbook courseGuestbook : courseGuestbookPage.getRecords()) {
|
for (CourseGuestbook courseGuestbook : courseGuestbookPage.getRecords()) {
|
||||||
courseGuestbook.setUser(userDao.selectById(courseGuestbook.getUserId()));
|
courseGuestbook.setUser(userDao.selectById(courseGuestbook.getUserId()));
|
||||||
MPJLambdaWrapper<CourseGuestbook> w = new MPJLambdaWrapper();
|
MPJLambdaWrapper<CourseGuestbook> w = new MPJLambdaWrapper();
|
||||||
w.eq(CourseGuestbook::getPid,courseGuestbook.getId());
|
w.eq(CourseGuestbook::getPid,courseGuestbook.getId());
|
||||||
w.orderByAsc(CourseGuestbook::getCreateTime);
|
w.orderByDesc(CourseGuestbook::getCreateTime);
|
||||||
List<CourseGuestbook> list = this.getBaseMapper().selectList(w);
|
List<CourseGuestbook> list = this.getBaseMapper().selectList(w);
|
||||||
if (list.size() > 0) {
|
if (list.size() > 0) {
|
||||||
for (CourseGuestbook c : list){
|
for (CourseGuestbook c : list){
|
||||||
|
|||||||
Reference in New Issue
Block a user