预警列表查询添加学院查询

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

@@ -95,6 +95,9 @@ public class WarningNoticeLogController extends AbstractController {
         if(queryWarningLogParam.getWarningType() != null && queryWarningLogParam.getWarningType() == 0){
             queryWrapper.ne(WarningNoticeLog::getWarningType, 4);
         }
+        if(queryWarningLogParam.getCollegeId() != null){
+            queryWrapper.eq(WarningNoticeLog::getCollegeId, queryWarningLogParam.getCollegeId());
+        }
         if(queryWarningLogParam.getWarningStartTime() != null && queryWarningLogParam.getWarningEndTime() != null){
             queryWrapper.between(WarningNoticeLog::getWarningTime, queryWarningLogParam.getWarningStartTime().atStartOfDay(),queryWarningLogParam.getWarningEndTime().atTime(LocalTime.MAX));
         }

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

@@ -21,6 +21,9 @@ public class QueryWarningLogParam extends PageQuery {
     @ApiModelProperty("预警方式(1系统通知 2短信通知 3声光报警)")
     private String warningWay;
 
+    @ApiModelProperty("学院id")
+    private Long collegeId;
+
     @ApiModelProperty("预警开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate warningStartTime;