yzj
/
RK-archives
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

图书档案修改

master
penghao 3 years ago
parent
1fe6bed0a0
commit
6bc7e1f282
3 changed files with 45 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-archives/src/main/java/com/ruoyi/archives/mapper/ArchiveCategoryInfoMapper.java
  2. 42
      ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.java
  3. 3
      ruoyi-archives/src/main/resources/mapper/archives/ArchiveCategoryInfoMapper.xml

2
ruoyi-archives/src/main/java/com/ruoyi/archives/mapper/ArchiveCategoryInfoMapper.java
Unescape View File

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

42
ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveCategoryInfoServiceImpl.java
Unescape View File

@ -26,6 +26,9 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi @@ -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 @@ -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 @@ -125,23 +129,29 @@ public class ArchiveCategoryInfoServiceImpl implements IArchiveCategoryInfoServi
son.setName(record.getFileNum()+"-"+record.getProject_name());
result.add(son);
});
}else if (CategoryDict.TS_RECORD.equals(item.getCode())){
Iterator<ArchiveRecordInfo> it = mapTs.iterator();//使用迭代器
while(it.hasNext()){
ArchiveRecordInfo next = it.next();
if(next.getArchiveCategory().equals(item.getCode())&&next.getArchiveScope()!=null){
ArchiveCategoryInfo son=new ArchiveCategoryInfo();
son.setParentId(item.getId());
son.setCode(item.getCode());
archiveCategoryInfo=archiveCategoryInfoService.getByCode(son);
List<ArchiveCategoryInfo> archiveCategoryInfoList = archiveCategoryInfoService.selectListBySon(archiveCategoryInfo);
for (int i = 0; i < archiveCategoryInfoList.size(); i++){
if (archiveCategoryInfoList.get(i).getId().equals(next.getArchiveScope())){
son.setName(archiveCategoryInfoList.get(i).getName());
son.setCode(item.getCode()+"-"+next.getArchiveScope().toString());
}
}
son.setId(new Random().nextLong()+100000L);
son.setSort(1l);
it.remove();//相同则添加，添加后删除
result.add(son);
}
}
} else
// if (CategoryDict.TS_RECORD.equals(item.getCode())){
// Iterator<ArchiveRecordInfo> it = map.iterator();//使用迭代器
// while(it.hasNext()){
// ArchiveRecordInfo next = it.next();
// if(next.getArchiveCategory().equals(item.getCode())&&next.getYear()!=null){
// ArchiveCategoryInfo son=new ArchiveCategoryInfo();
// son.setParentId(item.getId());
// son.setCode(item.getCode()+"-"+next.getYear());
// son.setId(new Random().nextLong()+100000L);
// son.setSort(1l);
// son.setName(next.getArchiveScope().toString());
// it.remove();//相同则添加，添加后删除
// result.add(son);
// }
// }
// } else
{
Iterator<ArchiveRecordInfo> it = map.iterator();//使用迭代器
while(it.hasNext()){

3
ruoyi-archives/src/main/resources/mapper/archives/ArchiveCategoryInfoMapper.xml
Unescape View File

@ -147,6 +147,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -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

Write Preview
Loading…
Cancel
Save