From 47488a7bf69c5cdae18e80a616ec0a43e890765d Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Sat, 14 Sep 2024 17:32:20 +0800
Subject: [PATCH] 小程序协议

---
 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