Merge branch 'master' of http://git.linkupx.com/yzj/RK-archives

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

@@ -122,7 +122,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
                     son.setCode(item.getCode()+"-"+record.getFileNum());
                     son.setId(new Random().nextLong()+100000L);
                     son.setSort(1l);
-                    son.setName(record.getFileNum());
+                    son.setName(record.getFileNum()+"-"+record.getProject_name());
                     result.add(son);
                 });
             }else{

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

@@ -149,17 +149,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectFileNumGroupByCategory" resultType="com.ruoyi.archives.domain.ArchiveRecordInfo">
-     SELECT ARCHIVE_CATEGORY as archiveCategory,file_num as fileNum
+     SELECT ARCHIVE_CATEGORY as archiveCategory,file_num as fileNum,PROJECT_NAME AS project_Name
      FROM (
                 SELECT
                 ARCHIVE_CATEGORY,
-                SPLIT_PART(file_num, '-', #{index}) AS file_num
+                SPLIT_PART(file_num, '-', #{index}) AS file_num,
+                "PROJECT_NAME" AS PROJECT_NAME
                 from
                 "PUBLIC"."archive_record_info"
                 where
                 "PUBLIC"."archive_record_info"."ARCHIVE_CATEGORY" = #{recordCategory}
     )RESULT
-    GROUP BY RESULT.ARCHIVE_CATEGORY,RESULT.file_num
+    GROUP BY RESULT.ARCHIVE_CATEGORY,RESULT.file_num,RESULT.PROJECT_NAME
     ORDER BY RESULT.file_num
     </select>
 </mapper>