diff --git a/ruoyi-archives/src/main/java/com/ruoyi/archives/controller/ArchiveRecordInfoController.java b/ruoyi-archives/src/main/java/com/ruoyi/archives/controller/ArchiveRecordInfoController.java
index 047dc12a..90587650 100644
--- a/ruoyi-archives/src/main/java/com/ruoyi/archives/controller/ArchiveRecordInfoController.java
+++ b/ruoyi-archives/src/main/java/com/ruoyi/archives/controller/ArchiveRecordInfoController.java
@@ -66,6 +66,7 @@ public class ArchiveRecordInfoController extends BaseController {
     private ArchiveImportService importService;
 
 
+
     /**
      * 查询档案信息列表(预立卷)
      */
@@ -162,6 +163,10 @@ public class ArchiveRecordInfoController extends BaseController {
             ArchiveCategoryInfo archiveCategoryInfo = categoryInfoService.selectArchiveCategoryInfoById(archiveRecordInfo.getArchiveScope());
             archiveRecordInfo.setCategoryCode(archiveCategoryInfo.getCode());
         }
+//        String category = archiveRecordInfo.getArchiveCategory();
+//        if(category!=null && "JJ".equals(category)){
+//            archiveRecordInfo.setYear("");
+//        }
         try {
             archiveRecordInfoService.insertArchiveRecordInfo(archiveRecordInfo);
         } catch (Exception e) {
diff --git a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.java b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.java
index 5f78bb78..ddbb8bfd 100644
--- a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.java
+++ b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.java
@@ -168,6 +168,9 @@ public class ArchiveRecordInfoServiceImpl   implements IArchiveRecordInfoService
     public int insertArchiveRecordInfo(ArchiveRecordInfo archiveRecordInfo) throws Exception {
          if(CategoryDict.JJ_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){
              archiveRecordInfo.setProjectNumber(String.format("%03d", Integer.valueOf(archiveRecordInfo.getProjectNumber())));
+             numberGenUtil.toGenerate(archiveRecordInfo);//如果是基建新建是便生成档号
+             String JJyear=archiveRecordInfo.getFileNum().split("-")[0];
+             archiveRecordInfo.setYear(JJyear);
          }else if (CategoryDict.ZXXM_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){
              archiveRecordInfo.setProjectNumber(String.format("%04d",  Integer.valueOf(archiveRecordInfo.getProjectNumber())));
          }else if (CategoryDict.NJ_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){
diff --git a/ruoyi-archives/target/classes/com/ruoyi/archives/controller/ArchiveRecordInfoController.class b/ruoyi-archives/target/classes/com/ruoyi/archives/controller/ArchiveRecordInfoController.class
index c0d4f7eb..f83920dd 100644
Binary files a/ruoyi-archives/target/classes/com/ruoyi/archives/controller/ArchiveRecordInfoController.class and b/ruoyi-archives/target/classes/com/ruoyi/archives/controller/ArchiveRecordInfoController.class differ
diff --git a/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.class b/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.class
index 63a3d486..77d7701e 100644
Binary files a/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.class and b/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.class differ
diff --git a/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.class b/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.class
index 1d5feb69..88cd91b8 100644
Binary files a/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.class and b/ruoyi-archives/target/classes/com/ruoyi/archives/service/impl/ArchiveRecordInfoServiceImpl.class differ
diff --git a/ruoyi-common/target/classes/com/ruoyi/common/utils/ExcelListener.class b/ruoyi-common/target/classes/com/ruoyi/common/utils/ExcelListener.class
index 0b0a8919..62d0da3e 100644
Binary files a/ruoyi-common/target/classes/com/ruoyi/common/utils/ExcelListener.class and b/ruoyi-common/target/classes/com/ruoyi/common/utils/ExcelListener.class differ