From 4dc8a15cb1f1c7b8a70fce95f3f715b472302a9c Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Fri, 06 Sep 2024 18:20:26 +0800 Subject: [PATCH] 1、联合处置相关接口 2、查询办理结果接口 3、查询档案信息接口 4、修改督办相关接口等 --- dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java | 47 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java index 16a7070..8d272cb 100644 --- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java @@ -160,15 +160,21 @@ * @param terms * @return List */ - public List<FileIdTypeInfoBaseDTO> listIdTypeInfoByOwnerIdList(Map<String, Object> terms, String mainId){ - List<FileIdTypeInfoBaseDTO> fileTypeInfoBaseDTOList = new ArrayList<>(); + public List<FileIdTypeInfoBaseDTO> listIdTypeInfoByOwnerIdList(Map<String, Object> terms){ + try { + List<FileIdTypeInfoBaseDTO> fileTypeInfoBaseDTOList = new ArrayList<>(); - List<FileInfo> fileInfoList = mapper.listByids(terms, mainId); - if(CollectionUtils.isNotEmpty(fileInfoList)){ - fileTypeInfoBaseDTOList = this.getIdFileTypeInfoBaseDTOList(fileInfoList); + List<FileInfo> fileInfoList = mapper.listFile(terms); + if(CollectionUtils.isNotEmpty(fileInfoList)){ + fileTypeInfoBaseDTOList = this.getIdFileTypeInfoBaseDTOList(fileInfoList); + } + + return fileTypeInfoBaseDTOList; + }catch (Exception e){ + log.error("[FileInfoService.listIdTypeInfoByOwnerIdList]调用失败,异常信息:"+e, e); + throw new ServiceException("FileInfoService.listIdTypeInfoByOwnerIdList", e); } - return fileTypeInfoBaseDTOList; } /** @@ -219,6 +225,7 @@ fileTypeInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(ownerType)); fileTypeInfoBaseDTO.setSize(ownerIdFileInfoList.size()); List<FileInfoBaseDTO> fileInfoBaseDTOList = new ArrayList<>(); + StringBuffer fileNames = new StringBuffer(); for(FileInfo fileInfo: ownerIdFileInfoList){ if(ownerType.equals(fileInfo.getOwnerType())){ FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO(); @@ -226,8 +233,15 @@ fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat())); fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType())); fileInfoBaseDTOList.add(fileInfoBaseDTO); + if(StringUtils.isNotBlank(fileNames)){ + fileNames.append(fileInfo.getName()); + }else{ + fileNames.append("、" + fileInfo.getName()); + } + } } + fileTypeInfoBaseDTO.setFileNames(fileNames.toString()); fileTypeInfoBaseDTO.setFileList(fileInfoBaseDTOList); fileTypeInfoBaseDTOList.add(fileTypeInfoBaseDTO); } @@ -236,9 +250,6 @@ } } } - - - return fileIdTypeInfoBaseDTOList; } @@ -247,13 +258,19 @@ * @param terms * @return List */ - public List<FileIdInfoBaseDTO> listInfoByOwnerIdList(Map<String, Object> terms, String mainId) { - List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = new ArrayList<>(); - List<FileInfo> fileInfoList = mapper.listByids(terms, mainId); - if(CollectionUtils.isNotEmpty(fileInfoList)){ - fileIdInfoBaseDTOList = this.getFileInfoBaseDTOList(fileInfoList); + public List<FileIdInfoBaseDTO> listInfoByOwnerIdList(Map<String, Object> terms) { + try { + List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = new ArrayList<>(); + List<FileInfo> fileInfoList = mapper.listFile(terms); + if(CollectionUtils.isNotEmpty(fileInfoList)){ + fileIdInfoBaseDTOList = this.getFileInfoBaseDTOList(fileInfoList); + } + return fileIdInfoBaseDTOList; + }catch (Exception e){ + log.error("[FileInfoService.listInfoByOwnerIdList]调用失败,异常信息:"+e, e); + throw new ServiceException("FileInfoService.listInfoByOwnerIdList", e); } - return fileIdInfoBaseDTOList; + } /** -- Gitblit v1.8.0