干预列表添加场次名称
This commit is contained in:
parent
55fb959e49
commit
910b5b4d7a
|
@ -35,6 +35,7 @@ public class SysInterveneRecordVo implements Serializable {
|
||||||
private Long interveneId;
|
private Long interveneId;
|
||||||
|
|
||||||
private Long batchNo;
|
private Long batchNo;
|
||||||
|
private String sessionName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 预警记录id
|
* 预警记录id
|
||||||
|
|
|
@ -12,10 +12,12 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||||
import org.dromara.scale.constant.StatusEnum;
|
import org.dromara.scale.constant.StatusEnum;
|
||||||
import org.dromara.scale.domain.SysInterveneRecord;
|
import org.dromara.scale.domain.SysInterveneRecord;
|
||||||
|
import org.dromara.scale.domain.SysScalePublish;
|
||||||
import org.dromara.scale.domain.bo.SysInterveneRecordBo;
|
import org.dromara.scale.domain.bo.SysInterveneRecordBo;
|
||||||
import org.dromara.scale.domain.vo.SysInterveneRecordVo;
|
import org.dromara.scale.domain.vo.SysInterveneRecordVo;
|
||||||
import org.dromara.scale.domain.vo.TimeAxisVo;
|
import org.dromara.scale.domain.vo.TimeAxisVo;
|
||||||
import org.dromara.scale.mapper.SysInterveneRecordMapper;
|
import org.dromara.scale.mapper.SysInterveneRecordMapper;
|
||||||
|
import org.dromara.scale.mapper.SysScalePublishMapper;
|
||||||
import org.dromara.scale.mapper.SysWarnRecordMapper;
|
import org.dromara.scale.mapper.SysWarnRecordMapper;
|
||||||
import org.dromara.scale.service.ISysInterveneRecordService;
|
import org.dromara.scale.service.ISysInterveneRecordService;
|
||||||
import org.dromara.system.domain.SysUser;
|
import org.dromara.system.domain.SysUser;
|
||||||
|
@ -45,6 +47,8 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService
|
||||||
|
|
||||||
private final SysWarnRecordMapper warnMapper;
|
private final SysWarnRecordMapper warnMapper;
|
||||||
|
|
||||||
|
private final SysScalePublishMapper publishMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询干预列表
|
* 查询干预列表
|
||||||
*/
|
*/
|
||||||
|
@ -55,6 +59,10 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService
|
||||||
.eq(SysInterveneRecord::getUserId, userId)
|
.eq(SysInterveneRecord::getUserId, userId)
|
||||||
.orderByDesc(SysInterveneRecord::getCreateTime)
|
.orderByDesc(SysInterveneRecord::getCreateTime)
|
||||||
);
|
);
|
||||||
|
for (SysInterveneRecordVo record : result.getRecords()) {
|
||||||
|
SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo());
|
||||||
|
record.setSessionName(sysScalePublish.getSessionName());
|
||||||
|
}
|
||||||
return TableDataInfo.build(result);
|
return TableDataInfo.build(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue