|
|
@@ -583,7 +583,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
|
|
|
|
|
|
Map<String, byte[]> byteAryMap = new HashMap<>();
|
|
|
MaterialTask task = this.getById(dto.getMaterialTaskId());
|
|
|
-
|
|
|
+ int sortCode = 1;
|
|
|
for (MaterialTaskAppendix appendix : appendices) {
|
|
|
List<File> fileList = fileService.list(Wrappers.<File>query().lambda().eq(File::getId, appendix.getFileId()));
|
|
|
User user = userMap.get(appendix.getCreateUserId());
|
|
|
@@ -600,7 +600,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
|
|
|
outputStream.write(buffer, 0, bytesRead);
|
|
|
}
|
|
|
byte[] byteArray = outputStream.toByteArray();
|
|
|
- String fileName = user.getName() + "-" + user.getUserName() + "-" + task.getName();
|
|
|
+ String fileName = sortCode + "-" + user.getName() + "-" + user.getUserName() + "-" + task.getName();
|
|
|
if(fileList.size() > 1){
|
|
|
fileName += "-" + (i + 1);
|
|
|
}
|
|
|
@@ -608,6 +608,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
|
|
|
byteAryMap.put(fileName, byteArray);
|
|
|
in.close();
|
|
|
outputStream.close();
|
|
|
+ sortCode ++;
|
|
|
} catch (IOException e) {
|
|
|
throw new MyException("文件下载失败", e);
|
|
|
}
|