干预列表优化
This commit is contained in:
parent
5c556dd740
commit
7ed87f3b9f
|
@ -1,5 +1,6 @@
|
||||||
package org.dromara.scale.service.impl;
|
package org.dromara.scale.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
@ -60,14 +61,16 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService
|
||||||
.eq(SysInterveneRecord::getUserId, userId)
|
.eq(SysInterveneRecord::getUserId, userId)
|
||||||
.orderByDesc(SysInterveneRecord::getCreateTime)
|
.orderByDesc(SysInterveneRecord::getCreateTime)
|
||||||
);
|
);
|
||||||
for (SysInterveneRecordVo record : result.getRecords()) {
|
if (ObjectUtil.isNotEmpty(result.getRecords())) {
|
||||||
SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo());
|
for (SysInterveneRecordVo record : result.getRecords()) {
|
||||||
record.setSessionName(sysScalePublish.getSessionName());
|
SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo());
|
||||||
SysWarnRecord warn = warnMapper.selectOne(new LambdaQueryWrapper<SysWarnRecord>()
|
record.setSessionName(sysScalePublish.getSessionName());
|
||||||
.select(SysWarnRecord::getNote)
|
SysWarnRecord warn = warnMapper.selectOne(new LambdaQueryWrapper<SysWarnRecord>()
|
||||||
.eq(SysWarnRecord::getBatchNo, record.getBatchNo())
|
.select(SysWarnRecord::getNote)
|
||||||
.eq(SysWarnRecord::getUserId, record.getUserId()));
|
.eq(SysWarnRecord::getBatchNo, record.getBatchNo())
|
||||||
record.setNote(warn.getNote());
|
.eq(SysWarnRecord::getUserId, record.getUserId()));
|
||||||
|
record.setNote(warn.getNote());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return TableDataInfo.build(result);
|
return TableDataInfo.build(result);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue