【大病救助】【会员保障】审批功能代码

ruoyi-admin/src/main/resources/application.yml

@@ -93,17 +93,17 @@ spring:
         max-wait: -1ms
 # 邮箱配置
   mail:
-    host: smtp.qq.com   # qq的邮件服务器主机地址 【163网易邮箱的是smtp.163.com】
-    username: 399767396@qq.com  # 设置用户名
-    password: gikwqafauevjbiag # 设置密码，该处的密码是QQ邮箱开启SMTP的授权码而非QQ密码
-    port: 587            # 邮件服务器端口号  【163网易邮箱的是465】
-    properties:
-      mail:
-        smtp:
-          auth: true  # 必须进行授权认证，它的目的就是阻止他人任意乱发邮件
-          starttls: # SMTP加密方式:连接到一个TLS保护连接
-            enable: true
-            required: true
+#    host: smtp.qq.com   # qq的邮件服务器主机地址 【163网易邮箱的是smtp.163.com】
+#    username: 399767396@qq.com  # 设置用户名
+#    password: gikwqafauevjbiag # 设置密码，该处的密码是QQ邮箱开启SMTP的授权码而非QQ密码
+#    port: 587            # 邮件服务器端口号  【163网易邮箱的是465】
+#    properties:
+#      mail:
+#        smtp:
+#          auth: true  # 必须进行授权认证，它的目的就是阻止他人任意乱发邮件
+#          starttls: # SMTP加密方式:连接到一个TLS保护连接
+#            enable: true
+#            required: true
 
 # token配置
 token:

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

@@ -35,7 +35,7 @@ public class BaseController {
         String text;             // 邮件内容
         String attachmentPath;   // 每一个模块对应的的申请模板文件在linux服务器的存储路径
         String toEmail = reqBody.getString("toEmail");
-        if(StringUtils.isBlank(toEmail) || !CommonUtils.isRightEmail(toEmail)){
+        if(StringUtils.isBlank(toEmail)/* || !CommonUtils.isRightEmail(toEmail)*/){
             log.error("toEmail参数非法");
             return RspResult.error("toEmail参数非法");
         }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/dbjz/controller/DbjzController.java

@@ -30,7 +30,7 @@ public class DbjzController {
      * @return
      */
     @PostMapping("/saveOrUpdate")
-    public JSONObject saveOrUpdate(DbjzApplyInfo dbjzApplyInfo, DbjzFileSetDTO dbjzFileSetDTO, @RequestParam("moduleCode") String moduleCode){
+    public JSONObject saveOrUpdate(DbjzApplyInfo dbjzApplyInfo, DbjzFileSetDTO dbjzFileSetDTO){
         try {
             // 文件上传路径
             String fileStoragePath = RuoYiConfig.getUploadPath();
@@ -44,7 +44,7 @@ public class DbjzController {
                 } else {   // 修改操作
                     applyFormId = dbjzApplyInfo.getApplyFormId();
                 }
-                List<BaseFileInfo> baseFileInfoList = dbjzService.processUploadAndBuildParams(dbjzFileSetDTO, moduleCode, applyFormId, fileStoragePath);
+                List<BaseFileInfo> baseFileInfoList = dbjzService.processUploadAndBuildParams(dbjzFileSetDTO, "dbjz", "大病救助", applyFormId, fileStoragePath);
                 // 等上传的文件写盘成功，再向数据库写入对应的申请信息和与之关联的文件信息
                 dbjzService.saveOrUpdateDbjzApplyInfoAndBaseFileInfos(dbjzApplyInfo, user, applyFormId, baseFileInfoList);
                 return RspResult.success(true);

ruoyi-zzb/src/main/java/com/ruoyi/zzb/dbjz/service/DbjzService.java

@@ -44,50 +44,50 @@ public class DbjzService {
      * 完成【大病救助】模块需进行文件上传字段项的上传处理逻辑，并组装批量插入这些记录到相关数据表的参数
      * @param
      */
-    public List<BaseFileInfo> processUploadAndBuildParams(DbjzFileSetDTO dbjzFileSetDTO, String moduleCode, String applyFormId, String fileStoragePath) throws IOException {
+    public List<BaseFileInfo> processUploadAndBuildParams(DbjzFileSetDTO dbjzFileSetDTO, String moduleCode, String moduleName, String applyFormId, String fileStoragePath) throws IOException {
         List<BaseFileInfo> dataList = new ArrayList<>();
         MultipartFile[] dbjzsqbFiles = dbjzFileSetDTO.getDbjzsqbFiles();
-        List<BaseFileInfo> dbjzsqbRowDataList = baseService.doProcessUploadAndBuildParams(dbjzsqbFiles, moduleCode, "大病救助", applyFormId, "大病救助申请表", "dbjzsqb", fileStoragePath);
+        List<BaseFileInfo> dbjzsqbRowDataList = baseService.doProcessUploadAndBuildParams(dbjzsqbFiles, moduleCode, moduleName, applyFormId, "大病救助申请表", "dbjzsqb", fileStoragePath);
         if(dbjzsqbRowDataList.size() > 0){
             dataList.addAll(dbjzsqbRowDataList);
         }
         MultipartFile[] dbjlqzmFiles = dbjzFileSetDTO.getDbjlqzmFiles();
-        List<BaseFileInfo> dbjlqzmRowDataList = baseService.doProcessUploadAndBuildParams(dbjlqzmFiles, moduleCode, "大病救助", applyFormId, "低保金领取证明", "dbjlqzm", fileStoragePath);
+        List<BaseFileInfo> dbjlqzmRowDataList = baseService.doProcessUploadAndBuildParams(dbjlqzmFiles, moduleCode, moduleName, applyFormId, "低保金领取证明", "dbjlqzm", fileStoragePath);
         if(dbjlqzmRowDataList.size() > 0){
             dataList.addAll(dbjlqzmRowDataList);
         }
         MultipartFile[] yyfyjnmxzmFiles = dbjzFileSetDTO.getYyfyjnmxzmFiles();
-        List<BaseFileInfo> yyfyjnmxzmRowDataList = baseService.doProcessUploadAndBuildParams(yyfyjnmxzmFiles, moduleCode, "大病救助", applyFormId, "医药费用缴纳明细证明", "yyfyjnmxzm", fileStoragePath);
+        List<BaseFileInfo> yyfyjnmxzmRowDataList = baseService.doProcessUploadAndBuildParams(yyfyjnmxzmFiles, moduleCode, moduleName, applyFormId, "医药费用缴纳明细证明", "yyfyjnmxzm", fileStoragePath);
         if(yyfyjnmxzmRowDataList.size() > 0){
             dataList.addAll(yyfyjnmxzmRowDataList);
         }
         MultipartFile[] zdzmfyjFiles = dbjzFileSetDTO.getZdzmfyjFiles();
-        List<BaseFileInfo> zdzmfyjRowDataList = baseService.doProcessUploadAndBuildParams(zdzmfyjFiles, moduleCode, "大病救助", applyFormId, "诊断证明复印件", "zdzmfyj", fileStoragePath);
+        List<BaseFileInfo> zdzmfyjRowDataList = baseService.doProcessUploadAndBuildParams(zdzmfyjFiles, moduleCode, moduleName, applyFormId, "诊断证明复印件", "zdzmfyj", fileStoragePath);
         if(zdzmfyjRowDataList.size() > 0){
             dataList.addAll(zdzmfyjRowDataList);
         }
         MultipartFile[] basyfyjFiles = dbjzFileSetDTO.getBasyfyjFiles();
-        List<BaseFileInfo> basyfyjRowDataList = baseService.doProcessUploadAndBuildParams(basyfyjFiles, moduleCode, "大病救助", applyFormId, "病案首页复印件", "basyfyj", fileStoragePath);
+        List<BaseFileInfo> basyfyjRowDataList = baseService.doProcessUploadAndBuildParams(basyfyjFiles, moduleCode, moduleName, applyFormId, "病案首页复印件", "basyfyj", fileStoragePath);
         if(basyfyjRowDataList.size() > 0){
             dataList.addAll(basyfyjRowDataList);
         }
         MultipartFile[] sfzfyjFiles = dbjzFileSetDTO.getSfzfyjFiles();
-        List<BaseFileInfo> sfzfyjRowDataList = baseService.doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, "大病救助", applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
+        List<BaseFileInfo> sfzfyjRowDataList = baseService.doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, moduleName, applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
         if(sfzfyjRowDataList.size() > 0){
             dataList.addAll(sfzfyjRowDataList);
         }
         MultipartFile[] ryjlfyjFiles = dbjzFileSetDTO.getRyjlfyjFiles();
-        List<BaseFileInfo> ryjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(ryjlfyjFiles, moduleCode, "大病救助", applyFormId, "入院记录复印件", "ryjlfyj", fileStoragePath);
+        List<BaseFileInfo> ryjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(ryjlfyjFiles, moduleCode, moduleName, applyFormId, "入院记录复印件", "ryjlfyj", fileStoragePath);
         if(ryjlfyjRowDataList.size() > 0){
             dataList.addAll(ryjlfyjRowDataList);
         }
         MultipartFile[] cyjlfyjFiles = dbjzFileSetDTO.getCyjlfyjFiles();
-        List<BaseFileInfo> cyjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(cyjlfyjFiles, moduleCode, "大病救助", applyFormId, "出院记录复印件", "cyjlfyj", fileStoragePath);
+        List<BaseFileInfo> cyjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(cyjlfyjFiles, moduleCode, moduleName, applyFormId, "出院记录复印件", "cyjlfyj", fileStoragePath);
         if(cyjlfyjRowDataList.size() > 0){
             dataList.addAll(cyjlfyjRowDataList);
         }
         MultipartFile[] gsFiles = dbjzFileSetDTO.getGsFiles();
-        List<BaseFileInfo> gsRowDataList = baseService.doProcessUploadAndBuildParams(gsFiles, moduleCode, "大病救助", applyFormId, "公示", "gs", fileStoragePath);
+        List<BaseFileInfo> gsRowDataList = baseService.doProcessUploadAndBuildParams(gsFiles, moduleCode, moduleName, applyFormId, "公示", "gs", fileStoragePath);
         if(gsRowDataList.size() > 0){
             dataList.addAll(gsRowDataList);
         }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/hybz/controller/HybzController.java

@@ -31,7 +31,7 @@ public class HybzController {
      * @return
      */
     @PostMapping("/saveOrUpdate")
-    public JSONObject saveOrUpdate(HybzApplyInfo hybzApplyInfo, HybzFileSetDTO hybzFileSetDTO, @RequestParam("moduleCode") String moduleCode){
+    public JSONObject saveOrUpdate(HybzApplyInfo hybzApplyInfo, HybzFileSetDTO hybzFileSetDTO){
         try {
             // 文件上传路径
             String fileStoragePath = RuoYiConfig.getUploadPath();
@@ -45,7 +45,7 @@ public class HybzController {
                 } else {   // 修改操作
                     applyFormId = hybzApplyInfo.getApplyFormId();
                 }
-                List<BaseFileInfo> baseFileInfoList = hybzService.processUploadAndBuildParams(hybzFileSetDTO, moduleCode, applyFormId, fileStoragePath);
+                List<BaseFileInfo> baseFileInfoList = hybzService.processUploadAndBuildParams(hybzFileSetDTO, "hybz", "会员保障", applyFormId, fileStoragePath);
                 // 等上传的文件写盘成功，再向数据库写入对应的申请信息和与之关联的文件信息
                 hybzService.saveOrUpdateHybzApplyInfoAndBaseFileInfos(hybzApplyInfo, user, applyFormId, baseFileInfoList);
                 return RspResult.success(true);

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

@@ -45,56 +45,56 @@ public class HybzService {
      *
      * @param
      */
-    public List<BaseFileInfo> processUploadAndBuildParams(HybzFileSetDTO hybzFileSetDTO, String moduleCode, String applyFormId, String fileStoragePath) throws IOException {
+    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, "会员保障", applyFormId, "持卡会员审批表", "ckhyspb", fileStoragePath);
+        List<BaseFileInfo> ckhyspbRowDataList = baseService.doProcessUploadAndBuildParams(ckhyspbFiles, moduleCode, moduleName, applyFormId, "持卡会员审批表", "ckhyspb", fileStoragePath);
         if (ckhyspbRowDataList.size() > 0) {
             dataList.addAll(ckhyspbRowDataList);
         }
         MultipartFile[] sfzfyjFiles = hybzFileSetDTO.getSfzfyjFiles();
-        List<BaseFileInfo> sfzfyjRowDataList = baseService.doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, "会员保障", applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
+        List<BaseFileInfo> sfzfyjRowDataList = baseService.doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, moduleName, applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
         if (sfzfyjRowDataList.size() > 0) {
             dataList.addAll(sfzfyjRowDataList);
         }
         MultipartFile[] hykfyjFiles = hybzFileSetDTO.getHykfyjFiles();
-        List<BaseFileInfo> hykfyjRowDataList = baseService.doProcessUploadAndBuildParams(hykfyjFiles, moduleCode, "会员保障", applyFormId, "会员卡复印件", "hykfyj", fileStoragePath);
+        List<BaseFileInfo> hykfyjRowDataList = baseService.doProcessUploadAndBuildParams(hykfyjFiles, moduleCode, moduleName, applyFormId, "会员卡复印件", "hykfyj", fileStoragePath);
         if (hykfyjRowDataList.size() > 0) {
             dataList.addAll(hykfyjRowDataList);
         }
         MultipartFile[] zdzmyjFiles = hybzFileSetDTO.getZdzmyjFiles();
-        List<BaseFileInfo> zdzmyjRowDataList = baseService.doProcessUploadAndBuildParams(zdzmyjFiles, moduleCode, "会员保障", applyFormId, "诊断证明原件", "zdzmyj", fileStoragePath);
+        List<BaseFileInfo> zdzmyjRowDataList = baseService.doProcessUploadAndBuildParams(zdzmyjFiles, moduleCode, moduleName, applyFormId, "诊断证明原件", "zdzmyj", fileStoragePath);
         if (zdzmyjRowDataList.size() > 0) {
             dataList.addAll(zdzmyjRowDataList);
         }
         MultipartFile[] basyfyjFiles = hybzFileSetDTO.getBasyfyjFiles();
-        List<BaseFileInfo> basyfyjRowDataList = baseService.doProcessUploadAndBuildParams(basyfyjFiles, moduleCode, "会员保障", applyFormId, "病案首页复印件", "basyfyj", fileStoragePath);
+        List<BaseFileInfo> basyfyjRowDataList = baseService.doProcessUploadAndBuildParams(basyfyjFiles, moduleCode, moduleName, applyFormId, "病案首页复印件", "basyfyj", fileStoragePath);
         if (basyfyjRowDataList.size() > 0) {
             dataList.addAll(basyfyjRowDataList);
         }
         MultipartFile[] ryjlfyjFiles = hybzFileSetDTO.getRyjlfyjFiles();
-        List<BaseFileInfo> ryjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(ryjlfyjFiles, moduleCode, "会员保障", applyFormId, "入院记录复印件", "ryjlfyj", fileStoragePath);
+        List<BaseFileInfo> ryjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(ryjlfyjFiles, moduleCode, moduleName, applyFormId, "入院记录复印件", "ryjlfyj", fileStoragePath);
         if (ryjlfyjRowDataList.size() > 0) {
             dataList.addAll(ryjlfyjRowDataList);
         }
         MultipartFile[] ssjlfyjFiles = hybzFileSetDTO.getSsjlfyjFiles();
-        List<BaseFileInfo> ssjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(ssjlfyjFiles, moduleCode, "会员保障", applyFormId, "手术记录复印件", "ssjlfyj", fileStoragePath);
+        List<BaseFileInfo> ssjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(ssjlfyjFiles, moduleCode, moduleName, applyFormId, "手术记录复印件", "ssjlfyj", fileStoragePath);
         if (ssjlfyjRowDataList.size() > 0) {
             dataList.addAll(ssjlfyjRowDataList);
         }
         MultipartFile[] cyjlfyjFiles = hybzFileSetDTO.getCyjlfyjFiles();
-        List<BaseFileInfo> cyjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(cyjlfyjFiles, moduleCode, "会员保障", applyFormId, "出院记录复印件", "cyjlfyj", fileStoragePath);
+        List<BaseFileInfo> cyjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(cyjlfyjFiles, moduleCode, moduleName, applyFormId, "出院记录复印件", "cyjlfyj", fileStoragePath);
         if (cyjlfyjRowDataList.size() > 0) {
             dataList.addAll(cyjlfyjRowDataList);
         }
         MultipartFile[] blbgfyjFiles = hybzFileSetDTO.getBlbgfyjFiles();
-        List<BaseFileInfo> blbgfyjRowDataList = baseService.doProcessUploadAndBuildParams(blbgfyjFiles, moduleCode, "会员保障", applyFormId, "病理报告复印件", "blbgfyj", fileStoragePath);
+        List<BaseFileInfo> blbgfyjRowDataList = baseService.doProcessUploadAndBuildParams(blbgfyjFiles, moduleCode, moduleName, applyFormId, "病理报告复印件", "blbgfyj", fileStoragePath);
         if (blbgfyjRowDataList.size() > 0) {
             dataList.addAll(blbgfyjRowDataList);
         }
         MultipartFile[] jcbgfyjFiles = hybzFileSetDTO.getJcbgfyjFiles();
-        List<BaseFileInfo> jcbgfyjRowDataList = baseService.doProcessUploadAndBuildParams(jcbgfyjFiles, moduleCode, "会员保障", applyFormId, "检查报告复印件", "jcbgfyj", fileStoragePath);
+        List<BaseFileInfo> jcbgfyjRowDataList = baseService.doProcessUploadAndBuildParams(jcbgfyjFiles, moduleCode, moduleName, applyFormId, "检查报告复印件", "jcbgfyj", fileStoragePath);
         if (jcbgfyjRowDataList.size() > 0) {
             dataList.addAll(jcbgfyjRowDataList);
         }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zyww/controller/ZywwController.java

@@ -30,7 +30,7 @@ public class ZywwController {
      * @return
      */
     @PostMapping("/saveOrUpdate")
-    public JSONObject saveOrUpdate(ZywwApplyInfo zywwApplyInfo, ZywwFileSetDTO zywwFileSetDTO, @RequestParam("moduleCode") String moduleCode){
+    public JSONObject saveOrUpdate(ZywwApplyInfo zywwApplyInfo, ZywwFileSetDTO zywwFileSetDTO){
         try {
             // 文件上传路径
             String fileStoragePath = RuoYiConfig.getUploadPath();
@@ -44,7 +44,7 @@ public class ZywwController {
                 } else {   // 修改操作
                     applyFormId = zywwApplyInfo.getApplyFormId();
                 }
-                List<BaseFileInfo> baseFileInfoList = zywwService.processUploadAndBuildParams(zywwFileSetDTO, moduleCode, applyFormId, fileStoragePath);
+                List<BaseFileInfo> baseFileInfoList = zywwService.processUploadAndBuildParams(zywwFileSetDTO, "zyww", "住院慰问", applyFormId, fileStoragePath);
                 // 等上传的文件写盘成功，再向数据库写入对应的申请信息和与之关联的文件信息
                 zywwService.saveOrUpdateZywwApplyInfoAndBaseFileInfos(zywwApplyInfo, user, applyFormId, baseFileInfoList);
                 return RspResult.success(true);
@@ -88,12 +88,13 @@ public class ZywwController {
         // 审批状态码  ---0：审批中，1：审批通过，2：审批驳回
         Integer approveStatus = reqBody.getInteger("approveStatus");
         String type = reqBody.getString("type");
+        String optFlag = reqBody.getString("optFlag");
         if(approveStatus == null || StringUtils.isBlank(type)){
             log.error("查询参数为空");
             return RspResult.error("查询参数为空");
         }
         try {
-            return RspResult.success(zywwService.getDataByPage(approveStatus, type, reqBody));
+            return RspResult.success(zywwService.getDataByPage(approveStatus, type, optFlag, reqBody));
         } catch (Exception e){
             log.error("根据条件分页查询【住院慰问】申请信息发生异常", e);
             return RspResult.error("根据条件分页查询【住院慰问】申请信息发生异常 - " + e.getMessage());

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zyww/domain/ZywwApplyInfo.java

@@ -2,11 +2,15 @@ package com.ruoyi.zzb.zyww.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.zzb.common.domain.BaseFileInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -52,8 +56,12 @@ public class ZywwApplyInfo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
-    @TableField(value = "UPDATE_TIME", fill = FieldFill.UPDATE)
+    @TableField(value = "UPDATE_TIME", fill = FieldFill.INSERT_UPDATE)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
+
+    // 不与数据库字段进行映射
+    @TableField(exist = false)
+    private List<BaseFileInfo> baseFileInfos = new ArrayList<>(0);
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zyww/service/ZywwService.java

@@ -45,60 +45,60 @@ public class ZywwService {
      * 完成【住院慰问】模块需进行文件上传字段项的上传处理逻辑，并组装批量插入这些记录到相关数据表的参数
      * @param
      */
-    public List<BaseFileInfo> processUploadAndBuildParams(ZywwFileSetDTO zywwFileSetDTO, String moduleCode, String applyFormId, String fileStoragePath) throws IOException {
+    public List<BaseFileInfo> processUploadAndBuildParams(ZywwFileSetDTO zywwFileSetDTO, String moduleCode, String moduleName, String applyFormId, String fileStoragePath) throws IOException {
         List<BaseFileInfo> dataList = new ArrayList<>();
         MultipartFile[] zywwsqbFiles = zywwFileSetDTO.getZywwsqbFiles();
-        List<BaseFileInfo> zywwsqbRowDataList = baseService.doProcessUploadAndBuildParams(zywwsqbFiles, moduleCode, "住院慰问", applyFormId, "住院慰问申请表", "zywwsqb", fileStoragePath);
+        List<BaseFileInfo> zywwsqbRowDataList = baseService.doProcessUploadAndBuildParams(zywwsqbFiles, moduleCode, moduleName, applyFormId, "住院慰问申请表", "zywwsqb", fileStoragePath);
         if(zywwsqbRowDataList.size() > 0){
             dataList.addAll(zywwsqbRowDataList);
         }
         MultipartFile[] zywwjhzsqbFiles = zywwFileSetDTO.getZywwjhzsqbFiles();
-        List<BaseFileInfo> zywwjhzsqbRowDataList = baseService.doProcessUploadAndBuildParams(zywwjhzsqbFiles, moduleCode, "住院慰问", applyFormId, "住院慰问金汇总申请表", "zywwjhzsqb", fileStoragePath);
+        List<BaseFileInfo> zywwjhzsqbRowDataList = baseService.doProcessUploadAndBuildParams(zywwjhzsqbFiles, moduleCode, moduleName, applyFormId, "住院慰问金汇总申请表", "zywwjhzsqb", fileStoragePath);
         if(zywwjhzsqbRowDataList.size() > 0){
             dataList.addAll(zywwjhzsqbRowDataList);
         }
         MultipartFile[] jcghwwjsbbFiles = zywwFileSetDTO.getJcghwwjsbbFiles();
-        List<BaseFileInfo> jcghwwjsbbRowDataList = baseService.doProcessUploadAndBuildParams(jcghwwjsbbFiles, moduleCode, "住院慰问", applyFormId, "基层工会慰问金申报表", "jcghwwjsbb", fileStoragePath);
+        List<BaseFileInfo> jcghwwjsbbRowDataList = baseService.doProcessUploadAndBuildParams(jcghwwjsbbFiles, moduleCode, moduleName, applyFormId, "基层工会慰问金申报表", "jcghwwjsbb", fileStoragePath);
         if(jcghwwjsbbRowDataList.size() > 0){
             dataList.addAll(jcghwwjsbbRowDataList);
         }
         MultipartFile[] zzzmFiles = zywwFileSetDTO.getZzzmFiles();
-        List<BaseFileInfo> zzzmRowDataList = baseService.doProcessUploadAndBuildParams(zzzmFiles, moduleCode, "住院慰问", applyFormId, "在职证明", "zzzm", fileStoragePath);
+        List<BaseFileInfo> zzzmRowDataList = baseService.doProcessUploadAndBuildParams(zzzmFiles, moduleCode, moduleName, applyFormId, "在职证明", "zzzm", fileStoragePath);
         if(zzzmRowDataList.size() > 0){
             dataList.addAll(zzzmRowDataList);
         }
         MultipartFile[] gsFiles = zywwFileSetDTO.getGsFiles();
-        List<BaseFileInfo> gsRowDataList = baseService.doProcessUploadAndBuildParams(gsFiles, moduleCode, "住院慰问", applyFormId, "公示", "gs", fileStoragePath);
+        List<BaseFileInfo> gsRowDataList = baseService.doProcessUploadAndBuildParams(gsFiles, moduleCode, moduleName, applyFormId, "公示", "gs", fileStoragePath);
         if(gsRowDataList.size() > 0){
             dataList.addAll(gsRowDataList);
         }
         MultipartFile[] sfzfyjFiles = zywwFileSetDTO.getSfzfyjFiles();
-        List<BaseFileInfo> sfzfyjRowDataList = baseService.doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, "住院慰问", applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
+        List<BaseFileInfo> sfzfyjRowDataList = baseService.doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, moduleName, applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
         if(sfzfyjRowDataList.size() > 0){
             dataList.addAll(sfzfyjRowDataList);
         }
         MultipartFile[] ghhykfyjFiles = zywwFileSetDTO.getGhhykfyjFiles();
-        List<BaseFileInfo> ghhykfyjRowDataList = baseService.doProcessUploadAndBuildParams(ghhykfyjFiles, moduleCode, "住院慰问", applyFormId, "工会会员卡复印件", "ghhykfyj", fileStoragePath);
+        List<BaseFileInfo> ghhykfyjRowDataList = baseService.doProcessUploadAndBuildParams(ghhykfyjFiles, moduleCode, moduleName, applyFormId, "工会会员卡复印件", "ghhykfyj", fileStoragePath);
         if(ghhykfyjRowDataList.size() > 0){
             dataList.addAll(ghhykfyjRowDataList);
         }
         MultipartFile[] zybasyfyjFiles = zywwFileSetDTO.getZybasyfyjFiles();
-        List<BaseFileInfo> zybasyfyjRowDataList = baseService.doProcessUploadAndBuildParams(zybasyfyjFiles, moduleCode, "住院慰问", applyFormId, "住院病案首页复印件", "zybasyfyj", fileStoragePath);
+        List<BaseFileInfo> zybasyfyjRowDataList = baseService.doProcessUploadAndBuildParams(zybasyfyjFiles, moduleCode, moduleName, applyFormId, "住院病案首页复印件", "zybasyfyj", fileStoragePath);
         if(zybasyfyjRowDataList.size() > 0){
             dataList.addAll(zybasyfyjRowDataList);
         }
         MultipartFile[] zdzmfyjFiles = zywwFileSetDTO.getZdzmfyjFiles();
-        List<BaseFileInfo> zdzmfyjRowDataList = baseService.doProcessUploadAndBuildParams(zdzmfyjFiles, moduleCode, "住院慰问", applyFormId, "诊断证明复印件", "zdzmfyj", fileStoragePath);
+        List<BaseFileInfo> zdzmfyjRowDataList = baseService.doProcessUploadAndBuildParams(zdzmfyjFiles, moduleCode, moduleName, applyFormId, "诊断证明复印件", "zdzmfyj", fileStoragePath);
         if(zdzmfyjRowDataList.size() > 0){
             dataList.addAll(zdzmfyjRowDataList);
         }
         MultipartFile[] gszmFiles = zywwFileSetDTO.getGszmFiles();
-        List<BaseFileInfo> gszmRowDataList = baseService.doProcessUploadAndBuildParams(gszmFiles, moduleCode, "住院慰问", applyFormId, "工伤证明", "gszm", fileStoragePath);
+        List<BaseFileInfo> gszmRowDataList = baseService.doProcessUploadAndBuildParams(gszmFiles, moduleCode, moduleName, applyFormId, "工伤证明", "gszm", fileStoragePath);
         if(gszmRowDataList.size() > 0){
             dataList.addAll(gszmRowDataList);
         }
         MultipartFile[] ssjlFiles = zywwFileSetDTO.getSsjlFiles();
-        List<BaseFileInfo> ssjlRowDataList = baseService.doProcessUploadAndBuildParams(ssjlFiles, moduleCode, "住院慰问", applyFormId, "手术记录", "ssjl", fileStoragePath);
+        List<BaseFileInfo> ssjlRowDataList = baseService.doProcessUploadAndBuildParams(ssjlFiles, moduleCode, moduleName, applyFormId, "手术记录", "ssjl", fileStoragePath);
         if(ssjlRowDataList.size() > 0){
             dataList.addAll(ssjlRowDataList);
         }
@@ -203,7 +203,7 @@ public class ZywwService {
      * @param
      * @return
      */
-    public Page<ZywwApplyInfo> getDataByPage(Integer approveStatus, String type, JSONObject reqBody){
+    public Page<ZywwApplyInfo> getDataByPage(Integer approveStatus, String type, String optFlag, JSONObject reqBody){
         Integer pageIndex = reqBody.getInteger("pageIndex") == null? 1:reqBody.getInteger("pageIndex");
         Integer pageSize = reqBody.getInteger("pageSize") == null? 10:reqBody.getInteger("pageSize");
         String applyFormId = reqBody.getString("applyFormId");
@@ -240,12 +240,18 @@ public class ZywwService {
         queryWrapper.orderByDesc("CREATE_TIME");
         Page<ZywwApplyInfo> page = new Page<>(pageIndex, pageSize);
         Page<ZywwApplyInfo> pageDataList = zywwApplyInfoMapper.selectPage(page, queryWrapper);
-        // 如果存在对应条件的用户申请记录，就关联查询该记录对应的文件信息记录
-//        if(pageDataList.getTotal() > 0){
-//            QueryWrapper<BaseFileInfo> qw = new QueryWrapper<>();
-//            qw.eq("")
-//        }
-//        baseFileInfoMapper.selectList()
+
+        // 如果存在对应条件的用户申请记录，并且当前是修改数据前的数据回显操作，则继续查询该申请记录对应的文件信息记录，并返回给前端
+        if(pageDataList != null && pageDataList.getTotal() > 0 && "update".equals(optFlag) && StringUtils.isNotBlank(applyFormId)){
+            QueryWrapper<BaseFileInfo> qw = new QueryWrapper<>();
+            qw.eq("APPLY_FORM_ID", applyFormId);
+            List<BaseFileInfo> baseFileInfosList = baseFileInfoMapper.selectList(qw);
+            // 将查询到的文件信息记录填充到对应的申请信息记录对象中，做数据回显使用
+            if(baseFileInfosList != null && baseFileInfosList.size() > 0){
+                ZywwApplyInfo zywwApplyInfo = pageDataList.getRecords().get(0);
+                zywwApplyInfo.setBaseFileInfos(baseFileInfosList);
+            }
+        }
         return pageDataList;
     }