Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-archive/src/main/java/org/springblade/archive/external/impl/ExternalDataArchiveFileService.java

@@ -99,7 +99,9 @@ public class ExternalDataArchiveFileService {
 
             //组卷ID
             Long archiveId = archiveAutoOutIdMapping.get(archiveFileVo.getArchiveId());
-            archiveFile.setArchiveId(archiveId);
+            if (archiveId!= null ){
+                archiveFile.setArchiveId(archiveId);
+            }
 
             //nodeId nodeSUB
             Long fileNodeId = archiveTreeOutIdMapping.get(archiveFileVo.getNodeId());

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -883,14 +883,16 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         if (!minDate.isEmpty() && !minDate.equals("null") ) {
             LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(minDate, "yyyyMMdd");
             if (localDateTime != null) {
-                archive.setStartDate(localDateTime.toString());
+                String strDate = FileUtils.cleanFileTime(localDateTime.toString());
+                archive.setStartDate(strDate);
             }
 
         }
         if (!maxDate.isEmpty() && !maxDate.equals("null") ) {
             LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(maxDate, "yyyyMMdd");
             if (localDateTime != null) {
-                archive.setEndDate(localDateTime.toString());
+                String strDate = FileUtils.cleanFileTime(localDateTime.toString());
+                archive.setEndDate(strDate);
             }
         }