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 844ebc10..448bf076 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 @@ -121,7 +121,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { }else if (CategoryDict.WS_RECORD.equals(type)){ // 文书档案 wsArchivesModelExcelImport(file,type); - }else if (CategoryDict.ZXXM_RECORD.equals(type)){ + }else if (CategoryDict.ZXXM_RECORD.equals(type)||CategoryDict.ZXXM_SECOND_RECORD.equals(type)){ // 咨询项目 zxxmArchivesModelExcelImport(file,type); } else if (CategoryDict.JYDA_RECORD.equals(type)){ @@ -188,7 +188,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { } else if (CategoryDict.WS_RECORD.equals(type)) { // 文书档案 key = archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear(); - } else if (CategoryDict.ZXXM_RECORD.equals(type)) { + } else if (CategoryDict.ZXXM_RECORD.equals(type)|| CategoryDict.ZXXM_SECOND_RECORD.equals(type)) { // 咨询项目 key = archiveRecordInfo.getArchiveCategory().toUpperCase()+archiveRecordInfo.getProjectNumber(); } else if (CategoryDict.JYDA_RECORD.equals(type)) { @@ -1524,6 +1524,9 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { case CategoryDict.ZXXM_RECORD: action=ArchiveUploadConfig.getZXXMAction(); break; + case CategoryDict.ZXXM_SECOND_RECORD: + action=ArchiveUploadConfig.getZXXMAction();//咨询项目档号变为KJ的情况 + break; case CategoryDict.JYDA_RECORD: action=ArchiveUploadConfig.getJYAction(); break; 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 96077e6b..d2e5f91c 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 @@ -170,7 +170,8 @@ public class ArchiveRecordInfoServiceImpl implements IArchiveRecordInfoService if(CategoryDict.JJ_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){ archiveRecordInfo.setProjectNumber(String.format("%03d", Integer.valueOf(archiveRecordInfo.getProjectNumber()))); numberGenUtil.toGenerate(archiveRecordInfo);//如果是基建新建是便生成档号 - }else if (CategoryDict.ZXXM_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){ + }else if (CategoryDict.ZXXM_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())|| + CategoryDict.ZXXM_SECOND_RECORD.equals(archiveRecordInfo.getArchiveCategory())){ archiveRecordInfo.setProjectNumber(String.format("%04d", Integer.valueOf(archiveRecordInfo.getProjectNumber()))); }else if (CategoryDict.NJ_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){ ArchiveRecordInfo example=new ArchiveRecordInfo(); @@ -196,7 +197,8 @@ public class ArchiveRecordInfoServiceImpl implements IArchiveRecordInfoService public int updateArchiveRecordInfo(ArchiveRecordInfo archiveRecordInfo) throws Exception { if(CategoryDict.JJ_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){ archiveRecordInfo.setProjectNumber(String.format("%03d", Integer.valueOf(archiveRecordInfo.getProjectNumber()))); - }else if (CategoryDict.ZXXM_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){ + }else if (CategoryDict.ZXXM_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())|| + CategoryDict.ZXXM_SECOND_RECORD.equals(archiveRecordInfo.getArchiveCategory())){ archiveRecordInfo.setProjectNumber(String.format("%04d", Integer.valueOf(archiveRecordInfo.getProjectNumber()))); }else if (CategoryDict.NJ_RECORD.equalsIgnoreCase(archiveRecordInfo.getArchiveCategory())){ ArchiveRecordInfo example=new ArchiveRecordInfo();