diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index 5168560..df77d03 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -105,6 +105,7 @@ alarmRecord.setResumeTime(alarmCancelRequest.getResumeTime()); alarmRecord.setCancelUser(null != user ? user.getId() : null); alarmRecord.setCancelTime(new Date()); + alarmRecord.setDetail(alarmCancelRequest.getDetail()); return this.updateById(alarmRecord); } return true; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index 5168560..df77d03 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -105,6 +105,7 @@ alarmRecord.setResumeTime(alarmCancelRequest.getResumeTime()); alarmRecord.setCancelUser(null != user ? user.getId() : null); alarmRecord.setCancelTime(new Date()); + alarmRecord.setDetail(alarmCancelRequest.getDetail()); return this.updateById(alarmRecord); } return true; diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java index 3890d31..c3c880d 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java @@ -83,7 +83,6 @@ page.setSize(10000); try { page = patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()); - List expResponseList = new ArrayList<>(); List responseList = page.getRecords(); responseList.forEach(busPatrolLogResponse->{ @@ -98,9 +97,6 @@ expResponseList.add(busPatrolLogResponse1); }); iBaseExportService.exportExcel(response, BusPatrolLogResponse.class, expResponseList, ExportEnum.BUSPATROL_LOG_EXPORT.getSheetName()); - page= patrolLogListPage(page, busPatrolLogDTO.getMonitorId(), busPatrolLogDTO.getStartTime(), busPatrolLogDTO.getEndTime()); - List busPatrolLogResponseList=page.getRecords(); - iBaseExportService.exportExcel(response, BusPatrolLogResponse.class,busPatrolLogResponseList, ExportEnum.BUSPATROL_LOG_EXPORT.getSheetName()); } catch (Exception e) { log.error("巡检日志导出异常,异常信息为{}", e); }