更细

src/main/java/org/jeecg/modules/prowork/service/impl/ProWorkMilestoneServiceImpl.java

@@ -101,8 +101,8 @@ public class ProWorkMilestoneServiceImpl extends ServiceImpl<ProWorkMilestoneMap
         QueryWrapper<ProWorkUpdateFile> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("work_mile_id", id);
         queryWrapper.lambda().eq(ProWorkUpdateFile::getDelFlag,"0");
+        queryWrapper.orderByAsc("sort");
         List<ProWorkUpdateFile> list = proWorkUpdateFileService.list(queryWrapper);
-        list.sort((x, y)-> Integer.compare(x.getSort(), y.getSort()));
         List<ProWorkUpdateFileRespDTO> fileList = Lists.newArrayList();
         for(ProWorkUpdateFile updateFile : list){
             ProWorkUpdateFileRespDTO respDTO = new ProWorkUpdateFileRespDTO(updateFile);
@@ -127,6 +127,7 @@ public class ProWorkMilestoneServiceImpl extends ServiceImpl<ProWorkMilestoneMap
             throw new JeecgBootException("文件信息不能为空");
         }
         List<ProWorkUpdateFile> list = Lists.newArrayList();
+        int sort = 1;
         for(ProWorkUpdateFileAddReqDTO fileAddReqDTO : reqDTO.getFileList()){
             ProWorkUpdateFile proWorkUpdateFile = new ProWorkUpdateFile(fileAddReqDTO);
             //截取文件名称
@@ -137,6 +138,7 @@ public class ProWorkMilestoneServiceImpl extends ServiceImpl<ProWorkMilestoneMap
             String fileName = fileNameBefore + "." + fileNameAfter;
             proWorkUpdateFile.setFileName(fileName);
             proWorkUpdateFile.setWorkMileId(id);
+            proWorkUpdateFile.setSort(sort++);
             list.add(proWorkUpdateFile);
         }
         proWorkUpdateFileService.saveBatch(list);