时间按照倒序排序；首页公告、公告管理中新增公告类型筛选

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseNoticeController.java

@@ -54,22 +54,26 @@ public class BaseNoticeController extends BaseController {
     public AjaxResult page(@NotEmpty(message = "数据为空")
                                @RequestBody BaseNoticePageReqVo vo) {
         LambdaQueryWrapper<BaseNotice> lw = new LambdaQueryWrapper<>();
-        if(!StringUtils.isBlank(vo.getTitle())){
-            lw.like(BaseNotice::getTitle,vo.getTitle());
+        if (!StringUtils.isBlank(vo.getTitle())) {
+            lw.like(BaseNotice::getTitle, vo.getTitle());
         }
-        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-            lw.ge(BaseNotice::getReleaseTime,vo.getStartTime());
+        if (!ObjectUtils.isEmpty(vo.getStartTime())) {
+            lw.ge(BaseNotice::getReleaseTime, vo.getStartTime());
         }
-        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-            lw.le(BaseNotice::getReleaseTime,vo.getEntTime());
+        if (!ObjectUtils.isEmpty(vo.getStartTime())) {
+            lw.le(BaseNotice::getReleaseTime, vo.getEntTime());
         }
+        if (!ObjectUtils.isEmpty(vo.getType())) {
+            lw.eq(BaseNotice::getType, vo.getType());
+        }
+        lw.orderByDesc(BaseNotice::getReleaseTime);
         IPage<BaseNotice> page = baseNoticeService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
         IPage<BaseNoticeVo> pagev = new Page<>();
         pagev.setTotal(page.getTotal());
         pagev.setCurrent(page.getCurrent());
         pagev.setPages(page.getPages());
 
-        if(!ObjectUtils.isEmpty(page) && page.getRecords().size()>0){
+        if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<BaseNoticeType> list = baseNoticeTypeService.list();
             List<Long> ids = list.stream().map(BaseNoticeType::getId).collect(Collectors.toList());
             List<BaseNoticeVo> collect = page.getRecords().stream().map(o -> {

purchase-system/src/main/java/com/ozs/base/vo/BaseNoticePageReqVo.java

@@ -1,6 +1,7 @@
 package com.ozs.base.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.vo.PageVo;
 import io.swagger.annotations.ApiModel;
@@ -9,6 +10,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
 @ApiModel(value = "BaseNoticePageReqVo", description = ModularConstans.notice+ "分页查询实体")
@@ -30,4 +32,9 @@ public class BaseNoticePageReqVo extends PageVo {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date entTime;
 
+    /**
+     * 公告类型
+     */
+    @ApiModelProperty("公告类型")
+    private Long type;
 }