|
|
@@ -89,6 +89,11 @@ public class ArchiveMeasurementController {
|
|
|
if (StringUtils.isNotEmpty(dutyUser)) {
|
|
|
dutyUser = URLDecoder.decode(dutyUser, StandardCharsets.UTF_8.toString());
|
|
|
}
|
|
|
+ if (StringUtils.isNotEmpty(fileTime) && fileTime.contains(".")) {
|
|
|
+ fileTime = fileTime.replace(".","");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
} catch (UnsupportedEncodingException e) {
|
|
|
e.printStackTrace();
|
|
|
@@ -127,11 +132,18 @@ public class ArchiveMeasurementController {
|
|
|
List<ArchiveFile> archiveFiles = archiveFileClient.getListByNodeIDName(periodNode.getId().toString(),fileName);
|
|
|
if (archiveFiles == null || archiveFiles.size() == 0) {
|
|
|
ArchiveFile archiveFile = new ArchiveFile();
|
|
|
+ archiveFile.setFileUrl(fileUrl);
|
|
|
archiveFile.setPdfFileUrl(fileUrl);
|
|
|
+ archiveFile.setFilePage(Integer.valueOf(pdfPage));
|
|
|
+ archiveFile.setFileSize(pdfSize);
|
|
|
archiveFile.setProjectId(periodNode.getProjectId().toString());
|
|
|
archiveFile.setContractId(periodNode.getContractId().toString());
|
|
|
archiveFile.setIsDeleted(0);
|
|
|
archiveFile.setIsArchive(0);
|
|
|
+ archiveFile.setFileNumber("\\");
|
|
|
+ archiveFile.setIsApproval(1);
|
|
|
+ archiveFile.setIsCertification(0);
|
|
|
+ archiveFile.setIsNeedCertification(1);
|
|
|
archiveFile.setNodeId(periodNode.getId().toString());
|
|
|
archiveFile.setPageNum(pdfPage);
|
|
|
archiveFile.setFileSize(pdfSize);
|
|
|
@@ -142,7 +154,7 @@ public class ArchiveMeasurementController {
|
|
|
if (periodNode.getStorageType() != null ) {
|
|
|
archiveFile.setFileType(periodNode.getStorageType().longValue());
|
|
|
}
|
|
|
-
|
|
|
+ archiveFile.setStatus(0);
|
|
|
List<ArchiveFile> archiveFileList = new ArrayList<>();
|
|
|
archiveFileList.add(archiveFile);
|
|
|
archiveFileClient.addArchiveFile(archiveFileList);
|
|
|
@@ -153,7 +165,7 @@ public class ArchiveMeasurementController {
|
|
|
if (StringUtils.isNotEmpty(archiveFile.getPdfFileUrl())) {
|
|
|
iossClient.removeFile(archiveFile.getPdfFileUrl());
|
|
|
}
|
|
|
-
|
|
|
+ archiveFile.setFileUrl(fileUrl);
|
|
|
archiveFile.setPdfFileUrl(fileUrl);
|
|
|
archiveFile.setFilePage(Integer.valueOf(pdfPage));
|
|
|
archiveFile.setFileSize(pdfSize);
|
liuyc