From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错，且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报，且点击上报后报错
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 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 ee9ce87..772b031 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
@@ -481,27 +481,43 @@
* @return List
*/
public List<FileInfoBaseDTO> listByMainId(String mainId){
- try {
- List<FileInfoBaseDTO> fileList = new ArrayList<>();
- Map<String, Object> terms = new HashMap<>();
- terms.put("mainId", mainId);
- List<FileInfo> fileInfoList = mapper.listFile(terms);
- if(CollectionUtils.isNotEmpty(fileInfoList)){
- for (FileInfo fileInfo : fileInfoList) {
- FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
- BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
- fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
- fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType()));
- fileList.add(fileInfoBaseDTO);
- }
+ List<FileInfoBaseDTO> fileList = new ArrayList<>();
+ Map<String, Object> terms = new HashMap<>();
+ terms.put("mainId", mainId);
+ List<FileInfo> fileInfoList = mapper.listFile(terms);
+ if(CollectionUtils.isNotEmpty(fileInfoList)){
+ for (FileInfo fileInfo : fileInfoList) {
+ FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
+ BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
+ fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
+ fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType()));
+ fileList.add(fileInfoBaseDTO);
}
- return fileList;
- }catch (Exception e){
- log.error("[FileInfoService.listByMainId]调用失败，异常信息："+e, e);
- throw new ServiceException("FileInfoService.listByMainId", e);
}
-
+ return fileList;
}
+ /**
+ * 根据多个所属编号查询附件
+ * @param mainId，ownerType
+ * @return List
+ */
+ public List<FileInfoBaseDTO> listByMainIdAndType(String mainId,String ownerType){
+ List<FileInfoBaseDTO> fileList = new ArrayList<>();
+ Map<String, Object> terms = new HashMap<>();
+ terms.put("mainId", mainId);
+ terms.put("ownerType", ownerType);
+ List<FileInfo> fileInfoList = mapper.listFileByType(terms);
+ if(CollectionUtils.isNotEmpty(fileInfoList)){
+ for (FileInfo fileInfo : fileInfoList) {
+ FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
+ BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
+ fileInfoBaseDTO.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
+ fileInfoBaseDTO.setOwnerTypeName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerType()));
+ fileList.add(fileInfoBaseDTO);
+ }
+ }
+ return fileList;
+ }
}
--
Gitblit v1.8.0