Skip to content

X
xinrenli
Commit ddd8fad1 by kaevom
Options

全部完成

parent 49634a5e
Showing with 16 additions and 10 deletions
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
...@@ -321,16 +321,24 @@ public class DbOrderServiceImpl implements IDbOrderService { ...@@ -321,16 +321,24 @@ public class DbOrderServiceImpl implements IDbOrderService {
pageQuery.setOrderByColumn("modifyTime"); pageQuery.setOrderByColumn("modifyTime");
Page<DbOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<DbOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(record -> { result.getRecords().forEach(record -> {
DbFileVo dbFileVo = fileMapper.selectVoOne(Wrappers.<DbFile>lambdaQuery() List<DbFileVo> dbFileVo = fileMapper.selectVoList(Wrappers.<DbFile>lambdaQuery()
.eq(DbFile::getServiceId, record.getId()) .eq(DbFile::getServiceId, record.getId())
.eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp()) .eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
.eq(DbFile::getSort, 1)
.eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())); .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
List<DbFileVo> vos = new ArrayList<>(); //文件类型分组
if (ObjectUtils.isNotEmpty(dbFileVo)) { Map<String, List<DbFileVo>> groupMap = dbFileVo.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
vos.add(dbFileVo); groupMap.forEach((k, v) -> {
} if (k.equals("picture")) {
record.setFileVos(vos); record.setPictureList(v);
}
if (k.equals("video")) {
record.setVideoList(v);
}
if (k.equals("voice")) {
record.setVoiceList(v);
}
});
record.setFileVos(dbFileVo);
}); });
return TableDataInfo.build(result); return TableDataInfo.build(result);
...@@ -403,9 +411,7 @@ public class DbOrderServiceImpl implements IDbOrderService { ...@@ -403,9 +411,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
.eq(DbFile::getServiceId, record.getId()) .eq(DbFile::getServiceId, record.getId())
.eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp()) .eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
.eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())); .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
if (ObjectUtils.isEmpty(dbFileVo)) {
// throw new RuntimeException("这个订单没有文件");
}
//文件类型分组 //文件类型分组
Map<String, List<DbFileVo>> groupMap = dbFileVo.stream().collect(Collectors.groupingBy(u -> u.getFileType())); Map<String, List<DbFileVo>> groupMap = dbFileVo.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
groupMap.forEach((k, v) -> { groupMap.forEach((k, v) -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment