2023-10-27 告警通知添加组织结构过滤和时间过滤条件。

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -121,7 +121,16 @@ public class WarningNoticeLogController extends AbstractController {
     @ApiOperation("小程序查询预警通知列表")
     public ResultData appList(@RequestBody QueryAppWarningLogParam queryAppWarningLogParam){
         Page<WarningNoticeLogVO> VOPage = new Page<>();
-        Page<WarningNoticeLog> page = warningNoticeLogService.page(new Page<WarningNoticeLog>(queryAppWarningLogParam.getPageNum(), queryAppWarningLogParam.getPageSize()), new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE).orderByDesc(WarningNoticeLog::getCreateTime));
+        LambdaQueryWrapper<WarningNoticeLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE);
+        if(Objects.nonNull(queryAppWarningLogParam.getCollegeId())){
+            lambdaQueryWrapper.eq(WarningNoticeLog::getCollegeId,queryAppWarningLogParam.getCollegeId());
+        }
+        if (Objects.nonNull(queryAppWarningLogParam.getStartTime()) && Objects.nonNull(queryAppWarningLogParam.getEndTime())) {
+            lambdaQueryWrapper.between(WarningNoticeLog::getCreateTime, queryAppWarningLogParam.getStartTime().atStartOfDay(), queryAppWarningLogParam.getEndTime().atTime(LocalTime.MAX));
+        }
+        lambdaQueryWrapper.orderByDesc(WarningNoticeLog::getCreateTime);
+        Page<WarningNoticeLog> page = warningNoticeLogService.page(new Page<WarningNoticeLog>(queryAppWarningLogParam.getPageNum(), queryAppWarningLogParam.getPageSize()),lambdaQueryWrapper);
         List<WarningNoticeLog> records = page.getRecords();
         if (records.size() > 0) {
             List<WarningNoticeLogVO> warningNoticeLogVOS = com.zd.common.core.utils.BeanUtils.copyList2List(records, WarningNoticeLogVO.class);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/QueryAppWarningLogParam.java

@@ -1,8 +1,12 @@
 package com.zd.laboratory.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.page.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 /**
  * @Description 查询小程序抱紧日志入参
  * @Author hzw
@@ -11,4 +15,14 @@ import lombok.Data;
  */
 @Data
 public class QueryAppWarningLogParam extends PageQuery {
+    @ApiModelProperty("学院id")
+    private Long collegeId;
+
+    @ApiModelProperty("开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startTime;
+
+    @ApiModelProperty("结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endTime;
 }