Browse Source

【大病救助】【会员保障】相关功能代码

fangtasyj 6 tháng trước cách đây
mục cha
commit
fe8c232628

+ 19 - 1
ruoyi-zzb/src/main/java/com/ruoyi/zzb/dbjz/domain/DbjzFileSetDTO.java

@@ -4,6 +4,7 @@ package com.ruoyi.zzb.dbjz.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 【大病救助】上传文件集合DTO
@@ -13,6 +14,23 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class DbjzFileSetDTO {
 
-
+    // 大病救助申请表
+    private MultipartFile[] dbjzsqbFiles;
+    // 低保金领取证明
+    private MultipartFile[] dbjlqzmFiles;
+    // 医药费用缴纳明细证明
+    private MultipartFile[] yyfyjnmxzmFiles;
+    // 诊断证明复印件
+    private MultipartFile[] zdzmfyjFiles;
+    // 病案首页复印件
+    private MultipartFile[] basyfyjFiles;
+    // 身份证复印件
+    private MultipartFile[] sfzfyjFiles;
+    // 入院记录复印件
+    private MultipartFile[] ryjlfyjFiles;
+    // 出院记录复印件
+    private MultipartFile[] cyjlfyjFiles;
+    // 公示
+    private MultipartFile[] gsFiles;
 
 }

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

@@ -8,32 +8,23 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.zzb.common.domain.BaseApproveInfo;
 import com.ruoyi.zzb.common.domain.BaseFileInfo;
 import com.ruoyi.zzb.common.mapper.BaseApproveInfoMapper;
 import com.ruoyi.zzb.common.mapper.BaseFileInfoMapper;
 import com.ruoyi.zzb.common.service.BaseService;
-import com.ruoyi.zzb.common.utils.CommonUtils;
 import com.ruoyi.zzb.dbjz.domain.DbjzApplyInfo;
 import com.ruoyi.zzb.dbjz.domain.DbjzFileSetDTO;
 import com.ruoyi.zzb.dbjz.mapper.DbjzApplyInfoMapper;
-import com.ruoyi.zzb.zyww.domain.ZywwApplyInfo;
-import com.ruoyi.zzb.zyww.domain.ZywwFileSetDTO;
-import com.ruoyi.zzb.zyww.mapper.ZywwApplyInfoMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @Slf4j
 @Service
@@ -43,8 +34,6 @@ public class DbjzService {
     @Autowired
     private DbjzApplyInfoMapper dbjzApplyInfoMapper;
     @Autowired
-    private ServerConfig serverConfig;
-    @Autowired
     private BaseFileInfoMapper baseFileInfoMapper;
     @Autowired
     private BaseApproveInfoMapper baseApproveInfoMapper;
@@ -57,16 +46,51 @@ public class DbjzService {
      */
     public List<BaseFileInfo> processUploadAndBuildParams(DbjzFileSetDTO dbjzFileSetDTO, String moduleCode, String applyFormId, String fileStoragePath) throws IOException {
         List<BaseFileInfo> dataList = new ArrayList<>();
-        /*MultipartFile[] zywwsqbFiles = zywwFileSetDTO.getZywwsqbFiles();
-        List<BaseFileInfo> zywwsqbRowDataList = doProcessUploadAndBuildParams(zywwsqbFiles, moduleCode, applyFormId, "住院慰问申请表", "zywwsqb", fileStoragePath);
-        if(zywwsqbRowDataList.size() > 0){
-            dataList.addAll(zywwsqbRowDataList);
+        MultipartFile[] dbjzsqbFiles = dbjzFileSetDTO.getDbjzsqbFiles();
+        List<BaseFileInfo> dbjzsqbRowDataList = baseService.doProcessUploadAndBuildParams(dbjzsqbFiles, moduleCode, "大病救助", applyFormId, "大病救助申请表", "dbjzsqb", fileStoragePath);
+        if(dbjzsqbRowDataList.size() > 0){
+            dataList.addAll(dbjzsqbRowDataList);
+        }
+        MultipartFile[] dbjlqzmFiles = dbjzFileSetDTO.getDbjlqzmFiles();
+        List<BaseFileInfo> dbjlqzmRowDataList = baseService.doProcessUploadAndBuildParams(dbjlqzmFiles, moduleCode, "大病救助", applyFormId, "低保金领取证明", "dbjlqzm", fileStoragePath);
+        if(dbjlqzmRowDataList.size() > 0){
+            dataList.addAll(dbjlqzmRowDataList);
+        }
+        MultipartFile[] yyfyjnmxzmFiles = dbjzFileSetDTO.getYyfyjnmxzmFiles();
+        List<BaseFileInfo> yyfyjnmxzmRowDataList = baseService.doProcessUploadAndBuildParams(yyfyjnmxzmFiles, moduleCode, "大病救助", applyFormId, "医药费用缴纳明细证明", "yyfyjnmxzm", fileStoragePath);
+        if(yyfyjnmxzmRowDataList.size() > 0){
+            dataList.addAll(yyfyjnmxzmRowDataList);
+        }
+        MultipartFile[] zdzmfyjFiles = dbjzFileSetDTO.getZdzmfyjFiles();
+        List<BaseFileInfo> zdzmfyjRowDataList = baseService.doProcessUploadAndBuildParams(zdzmfyjFiles, moduleCode, "大病救助", applyFormId, "诊断证明复印件", "zdzmfyj", fileStoragePath);
+        if(zdzmfyjRowDataList.size() > 0){
+            dataList.addAll(zdzmfyjRowDataList);
+        }
+        MultipartFile[] basyfyjFiles = dbjzFileSetDTO.getBasyfyjFiles();
+        List<BaseFileInfo> basyfyjRowDataList = baseService.doProcessUploadAndBuildParams(basyfyjFiles, moduleCode, "大病救助", applyFormId, "病案首页复印件", "basyfyj", fileStoragePath);
+        if(basyfyjRowDataList.size() > 0){
+            dataList.addAll(basyfyjRowDataList);
+        }
+        MultipartFile[] sfzfyjFiles = dbjzFileSetDTO.getSfzfyjFiles();
+        List<BaseFileInfo> sfzfyjRowDataList = baseService.doProcessUploadAndBuildParams(sfzfyjFiles, moduleCode, "大病救助", applyFormId, "身份证复印件", "sfzfyj", fileStoragePath);
+        if(sfzfyjRowDataList.size() > 0){
+            dataList.addAll(sfzfyjRowDataList);
+        }
+        MultipartFile[] ryjlfyjFiles = dbjzFileSetDTO.getRyjlfyjFiles();
+        List<BaseFileInfo> ryjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(ryjlfyjFiles, moduleCode, "大病救助", applyFormId, "入院记录复印件", "ryjlfyj", fileStoragePath);
+        if(ryjlfyjRowDataList.size() > 0){
+            dataList.addAll(ryjlfyjRowDataList);
+        }
+        MultipartFile[] cyjlfyjFiles = dbjzFileSetDTO.getCyjlfyjFiles();
+        List<BaseFileInfo> cyjlfyjRowDataList = baseService.doProcessUploadAndBuildParams(cyjlfyjFiles, moduleCode, "大病救助", applyFormId, "出院记录复印件", "cyjlfyj", fileStoragePath);
+        if(cyjlfyjRowDataList.size() > 0){
+            dataList.addAll(cyjlfyjRowDataList);
+        }
+        MultipartFile[] gsFiles = dbjzFileSetDTO.getGsFiles();
+        List<BaseFileInfo> gsRowDataList = baseService.doProcessUploadAndBuildParams(gsFiles, moduleCode, "大病救助", applyFormId, "公示", "gs", fileStoragePath);
+        if(gsRowDataList.size() > 0){
+            dataList.addAll(gsRowDataList);
         }
-        MultipartFile[] zywwjhzsqbFiles = zywwFileSetDTO.getZywwjhzsqbFiles();
-        List<BaseFileInfo> zywwjhzsqbRowDataList = doProcessUploadAndBuildParams(zywwjhzsqbFiles, moduleCode, applyFormId, "住院慰问金汇总申请表", "zywwjhzsqb", fileStoragePath);
-        if(zywwjhzsqbRowDataList.size() > 0){
-            dataList.addAll(zywwjhzsqbRowDataList);
-        }*/
         return dataList;
     }
 

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

@@ -8,10 +8,7 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.zzb.common.service.BaseService;
-import com.ruoyi.zzb.common.utils.CommonUtils;
 import com.ruoyi.zzb.common.domain.BaseApproveInfo;
 import com.ruoyi.zzb.common.domain.BaseFileInfo;
 import com.ruoyi.zzb.common.mapper.BaseApproveInfoMapper;
@@ -25,12 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @Slf4j
 @Service
@@ -137,7 +131,7 @@ public class HybzService {
                 // 1.根据当前申请记录,先批量插入新的文件记录
                 baseFileInfoMapper.batchInsertBaseFileInfos(baseFileInfoList);
                 // 2.再批量删除与当前申请记录相关联的全部原始文件记录,即可完成对文件信息的批量修改
-                boolean optFlag = delBaseFileInfosByApplyFormId(applyFormIdExist);
+                boolean optFlag = baseService.delBaseFileInfosByApplyFormId(applyFormIdExist);
                 if (optFlag) {
                     log.info("【会员保障】申请信息、文件信息均修改成功  申请单ID:{}", applyFormIdExist);
                 }
@@ -148,24 +142,6 @@ public class HybzService {
 
     }
 
-    /**
-     * 根据applyFormId 删除与之关联的文件信息记录
-     *
-     * @param applyFormId
-     * @return
-     */
-    @Transactional
-    public boolean delBaseFileInfosByApplyFormId(String applyFormId) {
-        int delBaseFileInfoRows = baseFileInfoMapper.deleteById(applyFormId);
-        if (delBaseFileInfoRows > 0) {
-            log.info("当前申请信息关联的文件信息删除成功  申请单ID:{},删除的数据条数:{}", applyFormId, delBaseFileInfoRows);
-            return true;
-        } else {
-            throw new RuntimeException("数据库申请信息对应的文件信息记录未删除或不存在  申请单ID:" + applyFormId);
-        }
-    }
-
-
     /**
      * 审批一条【会员保障】申请信息,并插入一条审批记录
      *

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

@@ -4,7 +4,6 @@ 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.utils.CommonUtils;
 import com.ruoyi.zzb.common.bean.RspResult;
 import com.ruoyi.zzb.common.utils.SnowflakeIdGenerator;
 import com.ruoyi.zzb.common.domain.BaseFileInfo;
@@ -14,7 +13,6 @@ 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
 

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

@@ -8,10 +8,7 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.zzb.common.service.BaseService;
-import com.ruoyi.zzb.common.utils.CommonUtils;
 import com.ruoyi.zzb.common.domain.BaseFileInfo;
 import com.ruoyi.zzb.zyww.domain.ZywwApplyInfo;
 import com.ruoyi.zzb.common.domain.BaseApproveInfo;
@@ -22,15 +19,12 @@ import com.ruoyi.zzb.common.mapper.BaseApproveInfoMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @Slf4j
 @Service