bug解决

wl

2022-08-08 d60406e8f251a7c8343825403f5fd71de1680975

 src/main/java/com/example/jz/controller/CommonQuestionController.java

@@ -3,17 +3,25 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.api.R;

import com.example.jz.dao.UserDao;
import com.example.jz.modle.PageParam;
import com.example.jz.modle.R;
import com.example.jz.modle.entity.CommonQuestion;
import com.example.jz.modle.entity.User;
import com.example.jz.modle.vo.QuestionVo;
import com.example.jz.service.CommonQuestionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;

/**
@@ -31,6 +39,8 @@
     */
    @Resource
    private CommonQuestionService commonQuestionService;
    @Resource
    UserDao userDao;

    /**
     * 分页查询所有数据
@@ -41,8 +51,24 @@
     */
    @GetMapping
    @ApiOperation("分页查询所有数据")
    public R<IPage<CommonQuestion>> selectAll(PageParam<CommonQuestion> page, CommonQuestion commonQuestion) {
        return R.ok(commonQuestionService.page(page, new QueryWrapper<>(commonQuestion)));
    public R<IPage<QuestionVo>> selectAll(PageParam<CommonQuestion> page, CommonQuestion commonQuestion) {
        ArrayList<QuestionVo> QuestionVos = new ArrayList<>();
        PageParam<CommonQuestion> CommonQuestionPageParam ;
        if (commonQuestion.getStatus()!=null ){
            CommonQuestionPageParam = commonQuestionService.page(page, new QueryWrapper<CommonQuestion>().like(StringUtils.isNotBlank(commonQuestion.getQuestionTitle()),"question_title",commonQuestion.getQuestionTitle()).eq("status",commonQuestion.getStatus()).orderByDesc("ctime"));
        }else {
            CommonQuestionPageParam = commonQuestionService.page(page, new QueryWrapper<CommonQuestion>().like(StringUtils.isNotBlank(commonQuestion.getQuestionTitle()),"question_title",commonQuestion.getQuestionTitle()).orderByDesc("ctime"));
        }
        CommonQuestionPageParam.getRecords().forEach(item->{
            QuestionVo QuestionVo = new QuestionVo();
            BeanUtils.copyProperties(item,QuestionVo);
            QuestionVo.setUserName(userDao.selectOne(new QueryWrapper<User>().eq("id",item.getCreator())).getRealName());
            QuestionVos.add(QuestionVo);
        });
        PageParam<QuestionVo> QuestionVoPageParam = new PageParam<>();
        BeanUtils.copyProperties(CommonQuestionPageParam,QuestionVoPageParam);
        QuestionVoPageParam.setRecords(QuestionVos);
        return R.ok(QuestionVoPageParam);
    }

    /**
@@ -68,6 +94,7 @@
    public R<Boolean> insert(@RequestBody CommonQuestion commonQuestion) {
        commonQuestion.setStatus(0);
        commonQuestion.setCtime(new Date());
        commonQuestion.setCreator(userDao.selectOne(new QueryWrapper<User>().eq("login_username",  SecurityContextHolder.getContext().getAuthentication().getPrincipal())).getId());
        return R.ok(commonQuestionService.save(commonQuestion));
    }