预警时间处理

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

@@ -65,6 +65,7 @@ public class WarningNoticeLogController extends AbstractController {
     @PostMapping("/list")
     @ApiOperation("查询预警通知列表")
     public ResultData list(@RequestBody QueryWarningLogParam queryWarningLogParam){
+        Page<WarningNoticeLogVO> warningNoticeLogPage = new Page<>();
         LambdaQueryWrapper<WarningNoticeLog> queryWrapper = new LambdaQueryWrapper<>();
         if(queryWarningLogParam.getWarningType() != null && queryWarningLogParam.getWarningType() != 0){
             queryWrapper.eq(WarningNoticeLog::getWarningType, queryWarningLogParam.getWarningType());
@@ -78,7 +79,13 @@ public class WarningNoticeLogController extends AbstractController {
         queryWrapper.eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE);
         queryWrapper.orderByDesc(WarningNoticeLog::getId);
         Page page = warningNoticeLogService.page(new Page(queryWarningLogParam.getPageNum(), queryWarningLogParam.getPageSize()), queryWrapper);
-        return ResultData.success(page);
+        List<WarningNoticeLog> records = page.getRecords();
+        if (records.size() > 0) {
+            BeanUtils.copyProperties(page, warningNoticeLogPage);
+            List<WarningNoticeLogVO> warningNoticeLogVOS = com.zd.common.core.utils.BeanUtils.copyList2List(records, WarningNoticeLogVO.class);
+            warningNoticeLogPage.setRecords(warningNoticeLogVOS);
+        }
+        return ResultData.success(warningNoticeLogPage);
     }
 
     @PostMapping("/appList")