实验室声光报警记录展示修改

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

@@ -103,6 +103,9 @@ public class WarningNoticeLogController extends AbstractController {
         if(queryWarningLogParam.getCollegeId() != null){
             queryWrapper.eq(WarningNoticeLog::getCollegeId, queryWarningLogParam.getCollegeId());
         }
+        if(queryWarningLogParam.getSubId() != null){
+            queryWrapper.eq(WarningNoticeLog::getSubId, queryWarningLogParam.getSubId());
+        }
         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

@@ -24,6 +24,9 @@ public class QueryWarningLogParam extends PageQuery {
     @ApiModelProperty("学院id")
     private Long collegeId;
 
+    @ApiModelProperty("实验室id")
+    private Long subId;
+
     @ApiModelProperty("预警开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate warningStartTime;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalDescServiceImpl.java

@@ -124,7 +124,8 @@ public class LabRiskPlanAbnormalDescServiceImpl implements ILabRiskPlanAbnormalD
             desc.setUpdateTime(new Date());
             warningNoticeLogService.update(new LambdaUpdateWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getKeyId,groupId)
                     .set(WarningNoticeLog::getRiskDuration,rd).set(WarningNoticeLog::getRecordVideo,recordVideo)
-                    .set(WarningNoticeLog::getResponder,handledPerson).set(WarningNoticeLog::getEndTime,now));
+                    .set(WarningNoticeLog::getResponder,handledPerson).set(WarningNoticeLog::getEndTime,now)
+                    .set(WarningNoticeLog::getDispose,1));
             return labRiskPlanAbnormalDescMapper.updateByGroupId(desc);
         }
         return 0;