迭代一键挂接功能

ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java

@@ -951,11 +951,25 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
             }
             archiveRecordInfo.setCaseNum(fileNum.substring(fileNum.lastIndexOf("-")+1));
             archiveRecordInfo.setArchiveCategory(type);
-            archiveRecordInfo.setYear(fileNum.substring(type.length(),fileNum.indexOf("-")));
+            if (fileNum.matches(ZX_FILE_NUM_SECOND_EXAMPLE)) {
+                String year = fileNum.split("-")[1];
+                if (year.startsWith("9")){
+                    year="19"+year;
+                }else {
+                    year="20"+year;
+                }
+                archiveRecordInfo.setYear(year);
+            }else {
+                archiveRecordInfo.setYear(fileNum.substring(type.length(),fileNum.indexOf("-")));
+            }
+
             if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear(),Integer.valueOf(archiveRecordInfo.getCaseNum()))==true){
                 throw  new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
             }
-            archiveRecordInfo.setStorageTime(fileNum.substring(fileNum.indexOf("-")+1,fileNum.lastIndexOf("-")));
+            if (fileNum.matches(ZX_FILE_NUM_EXAMPLE)){
+                archiveRecordInfo.setStorageTime(fileNum.substring(fileNum.indexOf("-")+1,fileNum.lastIndexOf("-")));
+            }
+
             archiveRecordInfo.setCreateId(SecurityUtils.getUserId().toString());
             archiveRecordInfo.setSource("0");
             archiveRecordInfo.setStatus("0");//预导入状态
@@ -1662,9 +1676,9 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
         ValueOperations<String, Object> ops = redisTemplate.opsForValue();
         Map<String, ArchiveRecordInfo> recordInfoMap = (Map<String, ArchiveRecordInfo>) ops.get(recordKey);
         List<ArchiveFileInfo> fileInfos = (List<ArchiveFileInfo>) ops.get(fileKey);
-//        if (recordInfoMap==null) {
-//            return AjaxResult.error("请先上传数据");
-//        }
+        if (recordInfoMap==null) {
+            return AjaxResult.error("请先上传数据");
+        }
         List<FileUploadList> fileUploadLists = uploadAllFiles(recordInfoMap, type);
         if (fileInfos!=null){
             changeRecordToFile(fileInfos,fileUploadLists);