From 010dc15d38f1dfa50d8e57009b213bb5d8c6616f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sun, 08 Oct 2023 14:11:29 +0800
Subject: [PATCH] fix:月数据修复
---
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
index 068944d..6b8804e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
@@ -64,7 +64,7 @@
sysFile.setCreateId(user.getUserId()).setCreateName(user.getUserName());
}
save(sysFile);
- return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename);
+ return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename).setFileType(fileType.getValue());
}
@Override
@@ -100,7 +100,7 @@
}
private String getFilePath(String sysCode) {
- return sysCode.concat(StringUtils.SLASH).concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
+ return sysCode.concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
}
public void storageFile(MultipartFile file, String originalFilename, String targetFolder) {
@@ -204,9 +204,9 @@
// 2.2.������������������������������
list.forEach(it -> {
existsList.removeIf(file -> file.getFileId().equals(it.getFileId()));
- it.setFileId(relationId);
FileTable file = new FileTable();
BeanUtils.copyProperties(it,file);
+ file.setRelationId(relationId);
addList.add(file);
});
if (!CollectionUtils.isEmpty(addList)) {
@@ -230,6 +230,7 @@
FileVo fileVo = new FileVo();
fileVo.setFileId(it.getFileId());
fileVo.setFileName(it.getFileName());
+ fileVo.setFileType(it.getFileType());
list.add(fileVo);
});
return list;
--
Gitblit v1.8.0