From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 19 四月 2024 15:08:22 +0800 Subject: [PATCH] bug修复 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbQuestionServiceImpl.java | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbQuestionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbQuestionServiceImpl.java index d66f98e..5be3308 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbQuestionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbQuestionServiceImpl.java @@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageDTO; import com.ruoyi.common.utils.BeanUtils; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.TbQuestion; import com.ruoyi.system.dto.QuestionDTO; -import com.ruoyi.system.dto.QuestionQueryDTO; -import com.ruoyi.system.dto.QuestionUpdDto; +import com.ruoyi.system.dto.update.QuestionUpdDTO; import com.ruoyi.system.mapper.TbQuestionMapper; +import com.ruoyi.system.query.QuestionQuery; import com.ruoyi.system.service.TbQuestionService; import com.ruoyi.system.vo.QuestionVO; import org.springframework.stereotype.Service; @@ -23,24 +24,29 @@ * @since 2024-03-13 */ @Service -public class TbQuestionServiceImpl extends ServiceImpl<TbQuestionMapper, TbQuestion> implements TbQuestionService { +public class TbQuestionServiceImpl extends ServiceImpl<TbQuestionMapper, TbQuestion> implements + TbQuestionService { @Override - public void addQuestion(QuestionDTO dto) { + public void addQuestion(QuestionDTO dto) throws Exception { TbQuestion tbQuestion = BeanUtils.copyBean(dto, TbQuestion.class); + tbQuestion.setQuarter(DateUtils.getNowQuarter()); this.save(tbQuestion); } @Override - public void editQuestion(QuestionUpdDto dto) { + public void editQuestion(QuestionUpdDTO dto) { TbQuestion tbQuestion = BeanUtils.copyBean(dto, TbQuestion.class); this.updateById(tbQuestion); } @Override - public PageDTO<QuestionVO> pageQuestion(QuestionQueryDTO dto) { + public PageDTO<QuestionVO> pageQuestion(QuestionQuery dto) { Page<TbQuestion> page = this.lambdaQuery() + .eq(StringUtils.isNotBlank(dto.getQuarter()), TbQuestion::getQuarter, + dto.getQuarter()) .like(StringUtils.isNotBlank(dto.getTitle()), TbQuestion::getTitle, dto.getTitle()) + .orderByDesc(TbQuestion::getCreateTime) .page(new Page<>(dto.getPageNum(), dto.getPageSize())); return PageDTO.of(page, QuestionVO.class); } -- Gitblit v1.7.1