From 3451c9a8d9d1ca2b949b209b4c1309bb15f20847 Mon Sep 17 00:00:00 2001
From: limingzhe <limingzhe@wondersgroup.com>
Date: Wed, 29 Jun 2022 23:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=BB=BA=E6=A1=A3=E6=A1=88=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ArchiveCategoryInfoServiceImpl.java       | 2 +-
 .../mapper/archives/ArchiveCategoryInfoMapper.xml          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.java b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.java
index b56d26d4..95376c23 100644
--- a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.java
+++ b/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{
diff --git a/ruoyi-archives/src/main/resources/mapper/archives/ArchiveCategoryInfoMapper.xml b/ruoyi-archives/src/main/resources/mapper/archives/ArchiveCategoryInfoMapper.xml
index 41341bb7..94fbef28 100644
--- a/ruoyi-archives/src/main/resources/mapper/archives/ArchiveCategoryInfoMapper.xml
+++ b/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>
\ No newline at end of file