From 910b5b4d7ae5cbe50ad166d460c6262f641269e8 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 7 Jun 2024 15:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E9=A2=84=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9C=BA=E6=AC=A1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/scale/domain/vo/SysInterveneRecordVo.java | 1 + .../scale/service/impl/SysInterveneRecordServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java index 4bdbd56..35a6541 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysInterveneRecordVo.java @@ -35,6 +35,7 @@ public class SysInterveneRecordVo implements Serializable { private Long interveneId; private Long batchNo; + private String sessionName; /** * 预警记录id diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java index ad949bb..8538f63 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java @@ -12,10 +12,12 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.scale.constant.StatusEnum; import org.dromara.scale.domain.SysInterveneRecord; +import org.dromara.scale.domain.SysScalePublish; import org.dromara.scale.domain.bo.SysInterveneRecordBo; import org.dromara.scale.domain.vo.SysInterveneRecordVo; import org.dromara.scale.domain.vo.TimeAxisVo; import org.dromara.scale.mapper.SysInterveneRecordMapper; +import org.dromara.scale.mapper.SysScalePublishMapper; import org.dromara.scale.mapper.SysWarnRecordMapper; import org.dromara.scale.service.ISysInterveneRecordService; import org.dromara.system.domain.SysUser; @@ -45,6 +47,8 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService private final SysWarnRecordMapper warnMapper; + private final SysScalePublishMapper publishMapper; + /** * 查询干预列表 */ @@ -55,6 +59,10 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService .eq(SysInterveneRecord::getUserId, userId) .orderByDesc(SysInterveneRecord::getCreateTime) ); + for (SysInterveneRecordVo record : result.getRecords()) { + SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo()); + record.setSessionName(sysScalePublish.getSessionName()); + } return TableDataInfo.build(result); }