全部完成

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java

@@ -321,16 +321,24 @@ public class DbOrderServiceImpl implements IDbOrderService {
         pageQuery.setOrderByColumn("modifyTime");
         Page<DbOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         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::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
-                .eq(DbFile::getSort, 1)
                 .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
-            List<DbFileVo> vos = new ArrayList<>();
-            if (ObjectUtils.isNotEmpty(dbFileVo)) {
-                vos.add(dbFileVo);
+            //文件类型分组
+            Map<String, List<DbFileVo>> groupMap = dbFileVo.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
+            groupMap.forEach((k, v) -> {
+                if (k.equals("picture")) {
+                    record.setPictureList(v);
                 }
-            record.setFileVos(vos);
+                if (k.equals("video")) {
+                    record.setVideoList(v);
+                }
+                if (k.equals("voice")) {
+                    record.setVoiceList(v);
+                }
+            });
+            record.setFileVos(dbFileVo);
 
         });
         return TableDataInfo.build(result);
@@ -403,9 +411,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
                 .eq(DbFile::getServiceId, record.getId())
                 .eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
                 .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()));
             groupMap.forEach((k, v) -> {