From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 31 十二月 2024 10:13:35 +0800 Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/web/BaseResPack.kt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/BaseResPack.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/BaseResPack.kt index ac7f6e1..2a6af5f 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/BaseResPack.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/BaseResPack.kt @@ -1,5 +1,6 @@ package cn.flightfeather.supervision.lightshare.web +import cn.flightfeather.supervision.common.exception.BizException import cn.flightfeather.supervision.lightshare.vo.BaseResponse import cn.flightfeather.supervision.lightshare.vo.DataHead @@ -14,12 +15,12 @@ if (head is DataHead) { BaseResponse(true, head = head, data = res.second) } else { - BaseResponse(true, data = res.second) + BaseResponse(true, data = res) } } else { BaseResponse(true, data = res) } - } catch (e: Exception) { + } catch (e: BizException) { BaseResponse(false, message = e.message ?: "") } } \ No newline at end of file -- Gitblit v1.9.3