添加增选第二种档号规则

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

@@ -86,6 +86,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
     private static String JYWJ_FILE_NUM_EXAMPLE="^[0-9]{4}-\\w+-[0-9]+";
     private static String SW_FILE_NUM_EXAMPLE="^\\w+-[0-9]{4}-\\w+-[0-9]+";
     private static String ZX_FILE_NUM_EXAMPLE="^ZX[0-9]{4}-\\w+-[0-9]+";
+    private static String ZX_FILE_NUM_SECOND_EXAMPLE="^Z+-[0-9]{2}+-[0-9]{0,2}+-[0-9]{1,3}+";
     private static String NJ_FILE_NUM_EXAMPLE="^NJ[0-9]{4}-[0-9]+";
     private static String ZXXM_FILE_NUM_EXAMPLE="^ZXXM[0-9]+-[0-9]+-[0-9]+";
     private static String ZXXM_SECOND_FILE_NUM_EXAMPLE="^KJ[0-9]+-[0-9]+-[0-9]+";
@@ -492,7 +493,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
             archiveRecordInfo.setYear(fileNum.substring(type.length(),fileNum.indexOf("-")));
             archiveRecordInfo.setStorageTime(split[1]);
             archiveRecordInfo.setCaseNum(split[3]);
-            if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
+            if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
                 throw  new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
             }
             if (StringUtils.isNotEmpty(item.getDescriptionTime())){
@@ -554,7 +555,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
         List<KeyValue> keyValues=new ArrayList<>();
         for (ArchiveRecordInfo archiveRecordInfo :  list) {
             //再次查询
-            if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
+            if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
                 //发现已存在相同流水号，则excel删除刚保存的redis数据
                 numberGenUtil.removeValueByKey(keyValues);
                 throw  new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——档号" + archiveRecordInfo.getFileNum() + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
@@ -564,7 +565,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
             keyValue.setKey(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear());
             keyValue.setValue(Integer.valueOf(archiveRecordInfo.getCaseNum()));
             keyValues.add(keyValue);
-            numberGenUtil.pushXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear(),Integer.valueOf(archiveRecordInfo.getCaseNum()));
+            numberGenUtil.pushXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear()+archiveRecordInfo.getStorageTime(),Integer.valueOf(archiveRecordInfo.getCaseNum()));
         }
         for (ArchiveFileInfo archiveFileInfo : archiveFileInfos) {
             if (archiveFileInfo!=null){
@@ -703,6 +704,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
     咨询项目导入
      */
 
+
     private void zxxmArchivesModelExcelImport(MultipartFile file, String type) throws Exception {
         List<ProjectArchivesModel> archivesModels = ExcelUtil.readExcel(file, ProjectArchivesModel.class, 1, 2);
         if (archivesModels==null||archivesModels.size()<=0){
@@ -934,7 +936,7 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
             //校验数据
             String fileNum =item.getFileNum().trim();
             //校验档号
-            boolean flag = fileNum.matches(ZX_FILE_NUM_EXAMPLE);
+            boolean flag = fileNum.matches(ZX_FILE_NUM_EXAMPLE)||fileNum.matches(ZX_FILE_NUM_SECOND_EXAMPLE);
             if (Boolean.FALSE==flag){
                 throw  new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——行号" + (i + 3) + "]档号不符合标准,请检查后提交");
             }

ruoyi-archives/src/main/resources/mapper/archives/ArchiveRecordInfoMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark !=null and remark !=''">and remark like concat('%', #{remark},'%')</if>
             <if test="project_name !=null and project_name !=''">and project_name like concat('%', #{project_name},'%')</if>
         </where>
-        ORDER BY "YEAR" DESC , "ARCHIVE_SCOPE" ASC , "CASE_NUM" ASC
+        ORDER BY "YEAR" ASC , "ARCHIVE_SCOPE" ASC , "CASE_NUM" ASC
     </select>
     
     <select id="selectArchiveRecordInfoById" parameterType="String" resultMap="ArchiveRecordInfoResult">