提交量表列表和发布记录
This commit is contained in:
parent
46e59efb2f
commit
d225839176
|
@ -21,6 +21,8 @@ import org.dromara.scale.mapper.SysEvaluationRecordMapper;
|
||||||
import org.dromara.scale.mapper.SysScaleMapper;
|
import org.dromara.scale.mapper.SysScaleMapper;
|
||||||
import org.dromara.scale.mapper.SysScalePublishMapper;
|
import org.dromara.scale.mapper.SysScalePublishMapper;
|
||||||
import org.dromara.scale.service.ISysScalePublishService;
|
import org.dromara.scale.service.ISysScalePublishService;
|
||||||
|
import org.dromara.system.domain.SysOss;
|
||||||
|
import org.dromara.system.mapper.SysOssMapper;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -47,6 +49,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
|
||||||
private final SysScaleMapper scaleMapper;
|
private final SysScaleMapper scaleMapper;
|
||||||
|
|
||||||
private final SysEvaluationRecordMapper recordMapper;
|
private final SysEvaluationRecordMapper recordMapper;
|
||||||
|
private final SysOssMapper sysOssMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询量发布
|
* 查询量发布
|
||||||
|
@ -160,6 +163,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
|
||||||
LambdaQueryWrapper<SysScalePublish> lqw = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<SysScalePublish> lqw = Wrappers.lambdaQuery();
|
||||||
lqw.eq(SysScalePublish::getDeptId, deptId);
|
lqw.eq(SysScalePublish::getDeptId, deptId);
|
||||||
lqw.eq(SysScalePublish::getStatus, 0);
|
lqw.eq(SysScalePublish::getStatus, 0);
|
||||||
|
lqw.last("limit 1");
|
||||||
sysScalePublishVo = baseMapper.selectVoOne(lqw);
|
sysScalePublishVo = baseMapper.selectVoOne(lqw);
|
||||||
}
|
}
|
||||||
//如果没用户组或者有用户组的发布为空,则查针对全部的发布
|
//如果没用户组或者有用户组的发布为空,则查针对全部的发布
|
||||||
|
@ -172,6 +176,11 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
|
||||||
Long batchNo = sysScalePublishVo.getBatchNo();
|
Long batchNo = sysScalePublishVo.getBatchNo();
|
||||||
String scaleIds = sysScalePublishVo.getScaleIds();
|
String scaleIds = sysScalePublishVo.getScaleIds();
|
||||||
List<SysScaleVo> publishScaleVos = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, scaleIds));
|
List<SysScaleVo> publishScaleVos = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, scaleIds));
|
||||||
|
for (SysScaleVo publishScaleVo : publishScaleVos) {
|
||||||
|
SysOss sysOss = sysOssMapper.selectById(publishScaleVo.getCover());
|
||||||
|
publishScaleVo.setCoverUrl(sysOss.getUrl());
|
||||||
|
}
|
||||||
|
|
||||||
List<SysEvaluationRecordVo> recordVos = recordMapper.selectSclaeRecordListByUserAndBatch(userId, batchNo);
|
List<SysEvaluationRecordVo> recordVos = recordMapper.selectSclaeRecordListByUserAndBatch(userId, batchNo);
|
||||||
for (SysEvaluationRecordVo recordVo : recordVos) {
|
for (SysEvaluationRecordVo recordVo : recordVos) {
|
||||||
publishScaleVos.stream().filter(p -> p.getScaleId().equals(recordVo.getScaleId()))
|
publishScaleVos.stream().filter(p -> p.getScaleId().equals(recordVo.getScaleId()))
|
||||||
|
|
Loading…
Reference in New Issue