From cf46ce653a320e12b70fd9aad2dac81dcab24984 Mon Sep 17 00:00:00 2001
From: yangzj <yangzj@qq.com>
Date: Fri, 19 Aug 2022 09:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E4=B8=80=E9=94=AE=E6=8C=82?=
 =?UTF-8?q?=E6=8E=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ArchiveImportServiceImpl.java        | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
index 501ed06d..4bdef001 100644
--- a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
+++ b/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);