图书档案修改

ruoyi-archives/src/main/java/com/ruoyi/archives/mapper/ArchiveCategoryInfoMapper.java

@@ -74,4 +74,6 @@ public interface ArchiveCategoryInfoMapper
     List<ArchiveRecordInfo> selectYearGroupByCategory();
 
     List<ArchiveRecordInfo> selectFileNumGroupByCategory(@Param("index") String index,@Param("recordCategory") String recordCategory);
+
+    List<ArchiveRecordInfo> selectArchiveScopeGroupByCategory();
 }

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

@@ -26,6 +26,9 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
     @Autowired
     private ArchiveCategoryInfoMapper archiveCategoryInfoMapper;
 
+    @Autowired
+    private IArchiveCategoryInfoService archiveCategoryInfoService;
+
     /**
      * 查询类目管理
      *
@@ -111,6 +114,7 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
     public List<ArchiveCategoryInfo> selectDeptListAndYear(ArchiveCategoryInfo archiveCategoryInfo) {
         List<ArchiveCategoryInfo> archiveCategoryInfos = archiveCategoryInfoMapper.selectDeptList(archiveCategoryInfo);
         List<ArchiveRecordInfo> map=archiveCategoryInfoMapper.selectYearGroupByCategory();
+        List<ArchiveRecordInfo> mapTs=archiveCategoryInfoMapper.selectArchiveScopeGroupByCategory();
         List<ArchiveRecordInfo> fileNumMap = archiveCategoryInfoMapper.selectFileNumGroupByCategory("1",CategoryDict.JJ_RECORD);
         List<ArchiveCategoryInfo> result=new ArrayList<>();
         for (ArchiveCategoryInfo item : archiveCategoryInfos) {
@@ -125,23 +129,29 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
                     son.setName(record.getFileNum()+"-"+record.getProject_name());
                     result.add(son);
                 });
-            }else
+            }else if (CategoryDict.TS_RECORD.equals(item.getCode())){
-//                if (CategoryDict.TS_RECORD.equals(item.getCode())){
+                Iterator<ArchiveRecordInfo> it = mapTs.iterator();//使用迭代器
-//                Iterator<ArchiveRecordInfo> it = map.iterator();//使用迭代器
+                while(it.hasNext()){
-//                while(it.hasNext()){
+                    ArchiveRecordInfo next = it.next();
-//                    ArchiveRecordInfo next = it.next();
+                    if(next.getArchiveCategory().equals(item.getCode())&&next.getArchiveScope()!=null){
-//                    if(next.getArchiveCategory().equals(item.getCode())&&next.getYear()!=null){
+                        ArchiveCategoryInfo son=new ArchiveCategoryInfo();
-//                        ArchiveCategoryInfo son=new ArchiveCategoryInfo();
+                        son.setParentId(item.getId());
-//                        son.setParentId(item.getId());
+                        son.setCode(item.getCode());
-//                        son.setCode(item.getCode()+"-"+next.getYear());
+                        archiveCategoryInfo=archiveCategoryInfoService.getByCode(son);
-//                        son.setId(new Random().nextLong()+100000L);
+                        List<ArchiveCategoryInfo> archiveCategoryInfoList = archiveCategoryInfoService.selectListBySon(archiveCategoryInfo);
-//                        son.setSort(1l);
+                        for (int i = 0; i < archiveCategoryInfoList.size(); i++){
-//                        son.setName(next.getArchiveScope().toString());
+                            if (archiveCategoryInfoList.get(i).getId().equals(next.getArchiveScope())){
-//                        it.remove();//相同则添加，添加后删除
+                                son.setName(archiveCategoryInfoList.get(i).getName());
-//                        result.add(son);
+                                son.setCode(item.getCode()+"-"+next.getArchiveScope().toString());
-//                    }
+                            }
-//                }
+                        }
-//            } else
+                        son.setId(new Random().nextLong()+100000L);
+                        son.setSort(1l);
+                        it.remove();//相同则添加，添加后删除
+                        result.add(son);
+                    }
+                }
+            } else
                 {
                 Iterator<ArchiveRecordInfo> it = map.iterator();//使用迭代器
                 while(it.hasNext()){

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

@@ -147,6 +147,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYearGroupByCategory" resultType="com.ruoyi.archives.domain.ArchiveRecordInfo">
         SELECT DISTINCT archive_category as archiveCategory,YEAR FROM "PUBLIC"."archive_record_info" GROUP BY archive_category,YEAR ORDER BY archive_category,YEAR
     </select>
+    <select id="selectArchiveScopeGroupByCategory" resultType="com.ruoyi.archives.domain.ArchiveRecordInfo">
+        SELECT DISTINCT archive_category as archiveCategory,archive_scope as archiveScope FROM "PUBLIC"."archive_record_info" GROUP BY archive_category,archive_scope ORDER BY archive_category,archive_scope
+    </select>
 
     <select id="selectFileNumGroupByCategory" resultType="com.ruoyi.archives.domain.ArchiveRecordInfo">
      SELECT ARCHIVE_CATEGORY as archiveCategory,file_num as fileNum,PROJECT_NAME AS project_Name