业务模块文件上传/取消上传通用接口功能改造

ruoyi-zzb/src/main/java/com/ruoyi/zzb/common/controller/BaseController.java

@@ -2,19 +2,10 @@ package com.ruoyi.zzb.common.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.zzb.common.bean.RspResult;
 import com.ruoyi.zzb.common.domain.BaseFileInfo;
+import com.ruoyi.zzb.common.domain.BaseFileSetDTO;
 import com.ruoyi.zzb.common.service.BaseService;
-import com.ruoyi.zzb.common.utils.SnowflakeIdGenerator;
-import com.ruoyi.zzb.dbjz.domain.DbjzFileSetDTO;
-import com.ruoyi.zzb.dbjz.service.DbjzService;
-import com.ruoyi.zzb.hybz.domain.HybzFileSetDTO;
-import com.ruoyi.zzb.hybz.service.HybzService;
-import com.ruoyi.zzb.zyww.domain.ZywwApplyInfo;
-import com.ruoyi.zzb.zyww.domain.ZywwFileSetDTO;
-import com.ruoyi.zzb.zyww.service.ZywwService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +20,6 @@ import java.util.List;
 @RequestMapping("/api/base")
 public class BaseController {
 
-    @Autowired
-    private BaseService baseService;
     @Value("${module.zyww.templateFilePath}")
     private String zywwTemplateFilePath;
     @Value("${module.dbjz.templateFilePath}")
@@ -38,11 +27,8 @@ public class BaseController {
     @Value("${module.hybz.templateFilePath}")
     private String hybzTemplateFilePath;
     @Autowired
-    private ZywwService zywwService;
-    @Autowired
-    private DbjzService dbjzService;
-    @Autowired
-    private HybzService hybzService;
+    private BaseService baseService;
+
 
     /**
      * 功能描述: 向目标邮箱地址发送一条带附件（支持多个）的邮件
@@ -61,7 +47,7 @@ public class BaseController {
             log.error("toEmail参数非法");
             return RspResult.error("toEmail参数非法");
         }
-        // 模块编码  ***前端在对应页面获取申请模板文件时需手动传入该参数，后端根据该参数值向目标邮箱发送对应的申请模板文件
+        // 模块编码  前端在对应页面获取申请模板文件时需手动传入该参数，后端根据该参数值向目标邮箱发送对应的申请模板文件
         String moduleCode = reqBody.getString("moduleCode");
         if(StringUtils.isBlank(moduleCode)){
             log.error("moduleCode参数为空");
@@ -69,15 +55,15 @@ public class BaseController {
         }
         if("zyww".equals(moduleCode)){
             subject = "【住院慰问】";
-            text = "住院慰问相关内容......";
+            text = "住院慰问相关内容";
             attachmentPath = zywwTemplateFilePath;
         } else if ("dbjz".equals(moduleCode)) {
             subject = "【大病救助】";
-            text = "大病救助相关内容......";
+            text = "大病救助相关内容";
             attachmentPath = dbjzTemplateFilePath;
         } else {
             subject = "【会员保障】";
-            text = "会员保障相关内容......";
+            text = "会员保障相关内容";
             attachmentPath = hybzTemplateFilePath;
         }
         try {
@@ -93,15 +79,16 @@ public class BaseController {
 
 
     /**
-     * 功能描述: 处理文件上传通用逻辑，并根据模块编码、申请单ID保存对应的文件信息记录
-     * @param: [zywwFileSetDTO, dbjzFileSetDTO, hybzFileSetDTO, moduleCode, applyFormId]
+     * 功能描述: 业务模块处理文件上传通用接口，并根据模块编码、申请单ID保存对应的文件信息记录到数据库
+     * @param: [baseFileSetDTO]
      * @return: com.alibaba.fastjson.JSONObject
      * @author: peifjFantasy
      * @Date: 2024/11/28 14:47
      */
     @PostMapping("/upload")
-    public JSONObject upload(ZywwFileSetDTO zywwFileSetDTO, DbjzFileSetDTO dbjzFileSetDTO, HybzFileSetDTO hybzFileSetDTO,
-                             @RequestParam("moduleCode") String moduleCode, @RequestParam("applyFormId") String applyFormId){
+    public JSONObject upload(BaseFileSetDTO baseFileSetDTO){
+        String moduleCode = baseFileSetDTO.getModuleCode();
+        String applyFormId = baseFileSetDTO.getApplyFormId();
         if(StringUtils.isBlank(moduleCode) || StringUtils.isBlank(applyFormId)){
             log.error("文件上传参数为空");
             return RspResult.error("文件上传参数为空");
@@ -110,28 +97,31 @@ public class BaseController {
             // 文件上传路径
             String fileStoragePath = RuoYiConfig.getUploadPath();
             List<BaseFileInfo> baseFileInfoList = new ArrayList<>();
+            String moduleName = "";
             if("zyww".equals(moduleCode)){
-                baseFileInfoList = zywwService.processUploadAndBuildParams(zywwFileSetDTO, "zyww", "住院慰问", applyFormId, fileStoragePath);
+                moduleName = "住院慰问";
             } else if("dbjz".equals(moduleCode)){
-                baseFileInfoList = dbjzService.processUploadAndBuildParams(dbjzFileSetDTO, "dbjz", "大病救助", applyFormId, fileStoragePath);
+                moduleName = "大病救助";
             } else {
-                baseFileInfoList = hybzService.processUploadAndBuildParams(hybzFileSetDTO, "hybz", "会员保障", applyFormId, fileStoragePath);
+                moduleName = "会员保障";
             }
+            baseFileInfoList = baseService.processUploadAndBuildParams(baseFileSetDTO, moduleCode, moduleName, applyFormId, fileStoragePath);
             // 等上传的文件写盘成功，再向数据库写入对应的文件信息记录
             if(baseFileInfoList.size() > 0){
                 BaseFileInfo baseFileInfo = baseFileInfoList.get(0);
+                // 保存文件信息到数据库
                 boolean optFlag = baseService.saveBaseFileInfo(baseFileInfo);
                 return optFlag? RspResult.success(baseFileInfo.getFileStorageId()) : RspResult.error("文件信息保存/修改失败 - 申请单ID：" + applyFormId);
             }
-            return RspResult.error("参数信息为空，文件信息无法保存/修改");
+            return RspResult.error("文件对象为空，信息无法保存/修改");
         } catch (Exception e){
-            log.error("申请信息保存/修改失败", e);
-            return RspResult.error("申请信息保存/修改失败 - " + e.getMessage());
+            log.error("文件信息保存/修改失败", e);
+            return RspResult.error("文件信息保存/修改失败 - " + e.getMessage());
         }
     }
 
     /**
-     * 功能描述: 文件取消上传接口，根据文件上传成功时服务器返回的文件存储ID删除数据库中对应的文件信息记录
+     * 功能描述: 业务模块文件取消上传通用接口，根据文件上传成功时服务器返回的文件存储ID(fileStorageId)去删除数据库中对应的文件信息记录
      * @param: [reqBody]
      * @return: com.alibaba.fastjson.JSONObject
      * @author: peifjFantasy 

ruoyi-zzb/src/main/java/com/ruoyi/zzb/common/domain/BaseFileSetDTO.java

@@ -0,0 +1,70 @@
+package com.ruoyi.zzb.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @Author: fangtasyJ
+ * @Date: 2024/12/4 14:21
+ * @Description: 业务模块处理文件上传通用DTO，枚举业务模块所需上传的全部文件类型，通过该类进行统一接收和处理
+ * @version: 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseFileSetDTO {
+
+    // 模块编码
+    private String moduleCode;
+    // 申请单ID
+    private String applyFormId;
+    // 住院慰问申请表
+    private MultipartFile[] zywwsqbFiles;
+    // 住院慰问金汇总申请表
+    private MultipartFile[] zywwjhzsqbFiles;
+    // 基层工会慰问金申报表
+    private MultipartFile[] jcghwwjsbbFiles;
+    // 在职证明
+    private MultipartFile[] zzzmFiles;
+    // 公示
+    private MultipartFile[] gsFiles;
+    // 身份证复印件
+    private MultipartFile[] sfzfyjFiles;
+    // 工会会员卡复印件
+    private MultipartFile[] ghhykfyjFiles;
+    // 住院病案首页复印件
+    private MultipartFile[] zybasyfyjFiles;
+    // 诊断证明复印件
+    private MultipartFile[] zdzmfyjFiles;
+    // 工伤证明
+    private MultipartFile[] gszmFiles;
+    // 手术记录
+    private MultipartFile[] ssjlFiles;
+    // 大病救助申请表
+    private MultipartFile[] dbjzsqbFiles;
+    // 低保金领取证明
+    private MultipartFile[] dbjlqzmFiles;
+    // 医药费用缴纳明细证明
+    private MultipartFile[] yyfyjnmxzmFiles;
+    // 病案首页复印件
+    private MultipartFile[] basyfyjFiles;
+    // 入院记录复印件
+    private MultipartFile[] ryjlfyjFiles;
+    // 出院记录复印件
+    private MultipartFile[] cyjlfyjFiles;
+    // 持卡会员审批表
+    private MultipartFile[] ckhyspbFiles;
+    // 会员卡复印件
+    private MultipartFile[] hykfyjFiles;
+    // 诊断证明原件
+    private MultipartFile[] zdzmyjFiles;
+    // 手术记录复印件
+    private MultipartFile[] ssjlfyjFiles;
+    // 病理报告复印件
+    private MultipartFile[] blbgfyjFiles;
+    // 检查报告复印件
+    private MultipartFile[] jcbgfyjFiles;
+
+}

ruoyi-zzb/src/main/java/com/ruoyi/zzb/common/service/BaseService.java

@@ -6,10 +6,12 @@ import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.zzb.common.domain.BaseFileInfo;
+import com.ruoyi.zzb.common.domain.BaseFileSetDTO;
 import com.ruoyi.zzb.common.mapper.BaseFileInfoMapper;
 import com.ruoyi.zzb.common.utils.CommonUtils;
 import com.ruoyi.zzb.dbjz.mapper.DbjzApplyInfoMapper;
 import com.ruoyi.zzb.hybz.mapper.HybzApplyInfoMapper;
+import com.ruoyi.zzb.zyww.domain.ZywwFileSetDTO;
 import com.ruoyi.zzb.zyww.mapper.ZywwApplyInfoMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,7 +124,164 @@ public class BaseService {
 
 
     /**
-     * 统一处理各模块文件上传，并构造对应数据对象
+     * 功能描述: 业务模块处理文件上传并构建文件信息参数对象通用方法
+     * @param: [baseFileSetDTO, moduleCode, moduleName, applyFormId, fileStoragePath]
+     * @return: java.util.List<com.ruoyi.zzb.common.domain.BaseFileInfo>
+     * @author: peifjFantasy
+     * @Date: 2024/12/4 15:08
+     */
+    public List<BaseFileInfo> processUploadAndBuildParams(BaseFileSetDTO baseFileSetDTO, String moduleCode, String moduleName, String applyFormId, String fileStoragePath) throws IOException {
+        List<BaseFileInfo> dataList = new ArrayList<>();
+        if("zyww".equals(moduleCode)){   // 住院慰问
+            MultipartFile[] zywwsqbFiles = baseFileSetDTO.getZywwsqbFiles();
+            List<BaseFileInfo> zywwsqbRowDataList = doProcessUploadAndBuildParams(zywwsqbFiles, moduleCode, moduleName, applyFormId, "住院慰问申请表", "zywwsqb", fileStoragePath);
+            if(zywwsqbRowDataList.size() > 0){
+                dataList.addAll(zywwsqbRowDataList);
+            }
+            MultipartFile[] zywwjhzsqbFiles = baseFileSetDTO.getZywwjhzsqbFiles();
+            List<BaseFileInfo> zywwjhzsqbRowDataList = doProcessUploadAndBuildParams(zywwjhzsqbFiles, moduleCode, moduleName, applyFormId, "住院慰问金汇总申请表", "zywwjhzsqb", fileStoragePath);
+            if(zywwjhzsqbRowDataList.size() > 0){
+                dataList.addAll(zywwjhzsqbRowDataList);
+            }
+            MultipartFile[] jcghwwjsbbFiles = baseFileSetDTO.getJcghwwjsbbFiles();
+            List<BaseFileInfo> jcghwwjsbbRowDataList = doProcessUploadAndBuildParams(jcghwwjsbbFiles, moduleCode, moduleName, applyFormId, "基层工会慰问金申报表", "jcghwwjsbb", fileStoragePath);
+            if(jcghwwjsbbRowDataList.size() > 0){
+                dataList.addAll(jcghwwjsbbRowDataList);
+            }
+            MultipartFile[] zzzmFiles = baseFileSetDTO.getZzzmFiles();
+            List<BaseFileInfo> zzzmRowDataList = doProcessUploadAndBuildParams(zzzmFiles, moduleCode, moduleName, applyFormId, "在职证明", "zzzm", fileStoragePath);
+            if(zzzmRowDataList.size() > 0){
+                dataList.addAll(zzzmRowDataList);
+            }
+            MultipartFile[] gsFiles = baseFileSetDTO.getGsFiles();
+            List<BaseFileInfo> gsRowDataList = doProcessUploadAndBuildParams(gsFiles, moduleCode, moduleName, applyFormId, "公示", "gs", fileStoragePath);
+            if(gsRowDataList.size() > 0){
+                dataList.addAll(gsRowDataList);
+            }
+            MultipartFile[] ghhykfyjFiles = baseFileSetDTO.getGhhykfyjFiles();
+            List<BaseFileInfo> ghhykfyjRowDataList = doProcessUploadAndBuildParams(ghhykfyjFiles, moduleCode, moduleName, applyFormId, "工会会员卡复印件", "ghhykfyj", fileStoragePath);
+            if(ghhykfyjRowDataList.size() > 0){
+                dataList.addAll(ghhykfyjRowDataList);
+            }
+            MultipartFile[] zybasyfyjFiles = baseFileSetDTO.getZybasyfyjFiles();
+            List<BaseFileInfo> zybasyfyjRowDataList = doProcessUploadAndBuildParams(zybasyfyjFiles, moduleCode, moduleName, applyFormId, "住院病案首页复印件", "zybasyfyj", fileStoragePath);
+            if(zybasyfyjRowDataList.size() > 0){
+                dataList.addAll(zybasyfyjRowDataList);
+            }
+            MultipartFile[] zdzmfyjFiles = baseFileSetDTO.getZdzmfyjFiles();
+            List<BaseFileInfo> zdzmfyjRowDataList = doProcessUploadAndBuildParams(zdzmfyjFiles, moduleCode, moduleName, applyFormId, "诊断证明复印件", "zdzmfyj", fileStoragePath);
+            if(zdzmfyjRowDataList.size() > 0){
+                dataList.addAll(zdzmfyjRowDataList);
+            }
+            MultipartFile[] gszmFiles = baseFileSetDTO.getGszmFiles();
+            List<BaseFileInfo> gszmRowDataList = doProcessUploadAndBuildParams(gszmFiles, moduleCode, moduleName, applyFormId, "工伤证明", "gszm", fileStoragePath);
+            if(gszmRowDataList.size() > 0){
+                dataList.addAll(gszmRowDataList);
+            }
+            MultipartFile[] ssjlFiles = baseFileSetDTO.getSsjlFiles();
+            List<BaseFileInfo> ssjlRowDataList = doProcessUploadAndBuildParams(ssjlFiles, moduleCode, moduleName, applyFormId, "手术记录", "ssjl", fileStoragePath);
+            if(ssjlRowDataList.size() > 0){
+                dataList.addAll(ssjlRowDataList);
+            }
+        } else if("dbjz".equals(moduleCode)){   // 大病救助
+            MultipartFile[] dbjzsqbFiles = baseFileSetDTO.getDbjzsqbFiles();
+            List<BaseFileInfo> dbjzsqbRowDataList = doProcessUploadAndBuildParams(dbjzsqbFiles, moduleCode, moduleName, applyFormId, "大病救助申请表", "dbjzsqb", fileStoragePath);
+            if(dbjzsqbRowDataList.size() > 0){
+                dataList.addAll(dbjzsqbRowDataList);
+            }
+            MultipartFile[] dbjlqzmFiles = baseFileSetDTO.getDbjlqzmFiles();
+            List<BaseFileInfo> dbjlqzmRowDataList = doProcessUploadAndBuildParams(dbjlqzmFiles, moduleCode, moduleName, applyFormId, "低保金领取证明", "dbjlqzm", fileStoragePath);
+            if(dbjlqzmRowDataList.size() > 0){
+                dataList.addAll(dbjlqzmRowDataList);
+            }
+            MultipartFile[] yyfyjnmxzmFiles = baseFileSetDTO.getYyfyjnmxzmFiles();
+            List<BaseFileInfo> yyfyjnmxzmRowDataList = doProcessUploadAndBuildParams(yyfyjnmxzmFiles, moduleCode, moduleName, applyFormId, "医药费用缴纳明细证明", "yyfyjnmxzm", fileStoragePath);
+            if(yyfyjnmxzmRowDataList.size() > 0){
+                dataList.addAll(yyfyjnmxzmRowDataList);
+            }
+            MultipartFile[] zdzmfyjFiles = baseFileSetDTO.getZdzmfyjFiles();
+            List<BaseFileInfo> zdzmfyjRowDataList = doProcessUploadAndBuildParams(zdzmfyjFiles, moduleCode, moduleName, applyFormId, "诊断证明复印件", "zdzmfyj", fileStoragePath);
+            if(zdzmfyjRowDataList.size() > 0){
+                dataList.addAll(zdzmfyjRowDataList);
+            }
+            MultipartFile[] basyfyjFiles = baseFileSetDTO.getBasyfyjFiles();
+            List<BaseFileInfo> basyfyjRowDataList = doProcessUploadAndBuildParams(basyfyjFiles, moduleCode, moduleName, applyFormId, "病案首页复印件", "basyfyj", fileStoragePath);
+            if(basyfyjRowDataList.size() > 0){
+                dataList.addAll(basyfyjRowDataList);
+            }
+            MultipartFile[] ryjlfyjFiles = baseFileSetDTO.getRyjlfyjFiles();
+            List<BaseFileInfo> ryjlfyjRowDataList = doProcessUploadAndBuildParams(ryjlfyjFiles, moduleCode, moduleName, applyFormId, "入院记录复印件", "ryjlfyj", fileStoragePath);
+            if(ryjlfyjRowDataList.size() > 0){
+                dataList.addAll(ryjlfyjRowDataList);
+            }
+            MultipartFile[] cyjlfyjFiles = baseFileSetDTO.getCyjlfyjFiles();
+            List<BaseFileInfo> cyjlfyjRowDataList = doProcessUploadAndBuildParams(cyjlfyjFiles, moduleCode, moduleName, applyFormId, "出院记录复印件", "cyjlfyj", fileStoragePath);
+            if(cyjlfyjRowDataList.size() > 0){
+                dataList.addAll(cyjlfyjRowDataList);
+            }
+            MultipartFile[] gsFiles = baseFileSetDTO.getGsFiles();
+            List<BaseFileInfo> gsRowDataList = doProcessUploadAndBuildParams(gsFiles, moduleCode, moduleName, applyFormId, "公示", "gs", fileStoragePath);
+            if(gsRowDataList.size() > 0){
+                dataList.addAll(gsRowDataList);
+            }
+        } else {   // 会员保障
+            MultipartFile[] ckhyspbFiles = baseFileSetDTO.getCkhyspbFiles();
+            List<BaseFileInfo> ckhyspbRowDataList = doProcessUploadAndBuildParams(ckhyspbFiles, moduleCode, moduleName, applyFormId, "持卡会员审批表", "ckhyspb", fileStoragePath);
+            if (ckhyspbRowDataList.size() > 0) {
+                dataList.addAll(ckhyspbRowDataList);
+            }
+            MultipartFile[] hykfyjFiles = baseFileSetDTO.getHykfyjFiles();
+            List<BaseFileInfo> hykfyjRowDataList = doProcessUploadAndBuildParams(hykfyjFiles, moduleCode, moduleName, applyFormId, "会员卡复印件", "hykfyj", fileStoragePath);
+            if (hykfyjRowDataList.size() > 0) {
+                dataList.addAll(hykfyjRowDataList);
+            }
+            MultipartFile[] zdzmyjFiles = baseFileSetDTO.getZdzmyjFiles();
+            List<BaseFileInfo> zdzmyjRowDataList = doProcessUploadAndBuildParams(zdzmyjFiles, moduleCode, moduleName, applyFormId, "诊断证明原件", "zdzmyj", fileStoragePath);
+            if (zdzmyjRowDataList.size() > 0) {
+                dataList.addAll(zdzmyjRowDataList);
+            }
+            MultipartFile[] basyfyjFiles = baseFileSetDTO.getBasyfyjFiles();
+            List<BaseFileInfo> basyfyjRowDataList = doProcessUploadAndBuildParams(basyfyjFiles, moduleCode, moduleName, applyFormId, "病案首页复印件", "basyfyj", fileStoragePath);
+            if (basyfyjRowDataList.size() > 0) {
+                dataList.addAll(basyfyjRowDataList);
+            }
+            MultipartFile[] ryjlfyjFiles = baseFileSetDTO.getRyjlfyjFiles();
+            List<BaseFileInfo> ryjlfyjRowDataList = doProcessUploadAndBuildParams(ryjlfyjFiles, moduleCode, moduleName, applyFormId, "入院记录复印件", "ryjlfyj", fileStoragePath);
+            if (ryjlfyjRowDataList.size() > 0) {
+                dataList.addAll(ryjlfyjRowDataList);
+            }
+            MultipartFile[] ssjlfyjFiles = baseFileSetDTO.getSsjlfyjFiles();
+            List<BaseFileInfo> ssjlfyjRowDataList = doProcessUploadAndBuildParams(ssjlfyjFiles, moduleCode, moduleName, applyFormId, "手术记录复印件", "ssjlfyj", fileStoragePath);
+            if (ssjlfyjRowDataList.size() > 0) {
+                dataList.addAll(ssjlfyjRowDataList);
+            }
+            MultipartFile[] cyjlfyjFiles = baseFileSetDTO.getCyjlfyjFiles();
+            List<BaseFileInfo> cyjlfyjRowDataList = doProcessUploadAndBuildParams(cyjlfyjFiles, moduleCode, moduleName, applyFormId, "出院记录复印件", "cyjlfyj", fileStoragePath);
+            if (cyjlfyjRowDataList.size() > 0) {
+                dataList.addAll(cyjlfyjRowDataList);
+            }
+            MultipartFile[] blbgfyjFiles = baseFileSetDTO.getBlbgfyjFiles();
+            List<BaseFileInfo> blbgfyjRowDataList = doProcessUploadAndBuildParams(blbgfyjFiles, moduleCode, moduleName, applyFormId, "病理报告复印件", "blbgfyj", fileStoragePath);
+            if (blbgfyjRowDataList.size() > 0) {
+                dataList.addAll(blbgfyjRowDataList);
+            }
+            MultipartFile[] jcbgfyjFiles = baseFileSetDTO.getJcbgfyjFiles();
+            List<BaseFileInfo> jcbgfyjRowDataList = doProcessUploadAndBuildParams(jcbgfyjFiles, moduleCode, moduleName, applyFormId, "检查报告复印件", "jcbgfyj", fileStoragePath);
+            if (jcbgfyjRowDataList.size() > 0) {
+                dataList.addAll(jcbgfyjRowDataList);
+            }
+        }
+        MultipartFile[] sfzfyjFiles = baseFileSetDTO.getSfzfyjFiles();
+        List<BaseFileInfo> sfzfyjRowDataList = doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, moduleName, applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
+        if(sfzfyjRowDataList.size() > 0){
+            dataList.addAll(sfzfyjRowDataList);
+        }
+        return dataList;
+    }
+
+
+    /**
+     * 统一处理业务模块文件上传，并构造对应数据对象
      * @param files
      * @param moduleCode
      * @param moduleName

ruoyi-zzb/src/main/java/com/ruoyi/zzb/hybz/service/HybzService.java

@@ -48,7 +48,6 @@ public class HybzService {
     public List<BaseFileInfo> processUploadAndBuildParams(HybzFileSetDTO hybzFileSetDTO, String moduleCode, String moduleName, String applyFormId, String fileStoragePath) throws IOException {
         List<BaseFileInfo> dataList = new ArrayList<>();
         MultipartFile[] ckhyspbFiles = hybzFileSetDTO.getCkhyspbFiles();
-        ;
         List<BaseFileInfo> ckhyspbRowDataList = baseService.doProcessUploadAndBuildParams(ckhyspbFiles, moduleCode, moduleName, applyFormId, "持卡会员审批表", "ckhyspb", fileStoragePath);
         if (ckhyspbRowDataList.size() > 0) {
             dataList.addAll(ckhyspbRowDataList);