diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackPageVO.java index c386752a0..d722a43a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackPageVO.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.xkt.vo.feedback; import com.ruoyi.web.controller.xkt.vo.BasePageVO; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,4 +16,9 @@ import lombok.EqualsAndHashCode; @ApiModel public class FeedbackPageVO extends BasePageVO { + @ApiModelProperty(value = "反馈内容") + private String content; + @ApiModelProperty(value = "联系方式") + private String contact; + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackPageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackPageDTO.java index 945b387fd..fffd92d3e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackPageDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackPageDTO.java @@ -2,6 +2,7 @@ package com.ruoyi.xkt.dto.feedback; import com.ruoyi.xkt.dto.BasePageDTO; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,4 +16,9 @@ import lombok.EqualsAndHashCode; @ApiModel public class FeedbackPageDTO extends BasePageDTO { + @ApiModelProperty(value = "反馈内容") + private String content; + @ApiModelProperty(value = "联系方式") + private String contact; + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/FeedbackMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/FeedbackMapper.java index 26c0075f8..a696a7dd9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/FeedbackMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/FeedbackMapper.java @@ -2,6 +2,10 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.Feedback; +import com.ruoyi.xkt.dto.feedback.FeedbackPageDTO; +import com.ruoyi.xkt.dto.feedback.FeedbackResDTO; + +import java.util.List; /** * 意见反馈 数据层 @@ -10,4 +14,12 @@ import com.ruoyi.xkt.domain.Feedback; */ public interface FeedbackMapper extends BaseMapper { + /** + * PC查询意见反馈列表 + * + * @param pageDTO 查询入参 + * @return List + */ + List selectPageList(FeedbackPageDTO pageDTO); + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/FeedbackServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/FeedbackServiceImpl.java index 355f7e14a..52b2c3aeb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/FeedbackServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/FeedbackServiceImpl.java @@ -54,10 +54,9 @@ public class FeedbackServiceImpl implements IFeedbackService { @Transactional(readOnly = true) public Page page(FeedbackPageDTO pageDTO) { PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); - List feedbackList = this.feedbackMapper.selectList(new LambdaQueryWrapper() - .eq(Feedback::getDelFlag, Constants.UNDELETED)); + List feedbackList = this.feedbackMapper.selectPageList(pageDTO); return CollectionUtils.isEmpty(feedbackList) ? Page.empty(pageDTO.getPageSize(), pageDTO.getPageNum()) - : Page.convert(new PageInfo<>(feedbackList), BeanUtil.copyToList(feedbackList, FeedbackResDTO.class)); + : Page.convert(new PageInfo<>(feedbackList)); } /** diff --git a/xkt/src/main/resources/mapper/FeedBackMapper.xml b/xkt/src/main/resources/mapper/FeedBackMapper.xml new file mode 100644 index 000000000..7bef443dd --- /dev/null +++ b/xkt/src/main/resources/mapper/FeedBackMapper.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file