业务模块接口测试，用户申请信息审批逻辑优化

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

@@ -52,6 +52,11 @@ public class BaseService {
     private DbjzApplyInfoMapper dbjzApplyInfoMapper;
     @Autowired
     private HybzApplyInfoMapper hybzApplyInfoMapper;
+    @Value("${server.port}")
+    private String port;
+    @Value("${server.servlet.context-path}")
+    private String contextPath;
+
 
     /**
      * 发送一条带附件的邮件消息
@@ -308,9 +313,9 @@ public class BaseService {
                     String newFileName = FileUploadUtils.upload(fileStoragePath, file);
                     log.info("【{}】文件上传成功  申请单ID：{}，文件类型名称：{}，文件名称：{}", moduleName, applyFormId, fileTypeName, originalFilename);
                     // 文件HTTP请求路径
-                    // 去掉'http://127.0.0.1:8088/zhzg'前缀
-                    String fileRequestPath = (serverConfig.getUrl() + newFileName).replace("http://127.0.0.1:8088/zhzg", "");
-
+                    // 去掉前缀
+                    String fileRequestPath = (serverConfig.getUrl() + newFileName).replace("http://127.0.0.1:" + port + contextPath, "")
+                            .replace("http://localhost:" + port + contextPath, "");
                     BaseFileInfo baseFileInfo = new BaseFileInfo();
                     baseFileInfo.setModuleCode(moduleCode);
                     baseFileInfo.setApplyFormId(applyFormId);

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

@@ -140,6 +140,12 @@ public class DbjzService {
      */
     @Transactional
     public boolean approveAndSaveApproveInfo(String applyFormId, String optFlag, String approveDesc, SysUser user){
+        QueryWrapper<DbjzApplyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("APPLY_FORM_ID", applyFormId);
+        DbjzApplyInfo dbjzApplyInfo = dbjzApplyInfoMapper.selectOne(queryWrapper);
+        if(dbjzApplyInfo != null && "1".equals(dbjzApplyInfo.getApproveStatusCode())){
+            throw new RuntimeException("数据库【大病救助】申请信息记录已通过审批，不支持重复审批  申请单ID：" + applyFormId);
+        }
         // 审批一条【大病救助】申请信息
         UpdateWrapper<DbjzApplyInfo> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("APPLY_FORM_ID", applyFormId);
@@ -154,9 +160,6 @@ public class DbjzService {
             BaseApproveInfo baseApproveInfo = new BaseApproveInfo();
             baseApproveInfo.setModuleCode("dbjz");
             baseApproveInfo.setApplyFormId(applyFormId);
-            QueryWrapper<DbjzApplyInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("APPLY_FORM_ID", applyFormId);
-            DbjzApplyInfo dbjzApplyInfo = dbjzApplyInfoMapper.selectOne(queryWrapper);
             baseApproveInfo.setCreateUserId(dbjzApplyInfo.getCreateUserId());
             baseApproveInfo.setCreateUserName(dbjzApplyInfo.getCreateUserName());
             baseApproveInfo.setCreateUserPoliceNo(dbjzApplyInfo.getCreateUserPoliceNo());

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

@@ -148,6 +148,12 @@ public class HybzService {
      */
     @Transactional
     public boolean approveAndSaveApproveInfo(String applyFormId, String optFlag, String approveDesc, SysUser user) {
+        QueryWrapper<HybzApplyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("APPLY_FORM_ID", applyFormId);
+        HybzApplyInfo hybzApplyInfo = hybzApplyInfoMapper.selectOne(queryWrapper);
+        if(hybzApplyInfo != null && "1".equals(hybzApplyInfo.getApproveStatusCode())){
+            throw new RuntimeException("数据库【会员保障】申请信息记录已通过审批，不支持重复审批  申请单ID：" + applyFormId);
+        }
         // 审批一条【会员保障】申请信息
         UpdateWrapper<HybzApplyInfo> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("APPLY_FORM_ID", applyFormId);
@@ -157,14 +163,11 @@ public class HybzService {
         hybzApplyInfoDTO.setApproveStatusName(optDesc);
         int updateRows = hybzApplyInfoMapper.update(hybzApplyInfoDTO, updateWrapper);
         if (updateRows > 0) {
-            log.info("【住院慰问】申请信息已审批  申请单ID：{}，审批操作描述：{}", applyFormId, optDesc);
+            log.info("【会员保障】申请信息已审批  申请单ID：{}，审批操作描述：{}", applyFormId, optDesc);
             // 插入一条审批记录
             BaseApproveInfo baseApproveInfo = new BaseApproveInfo();
             baseApproveInfo.setModuleCode("hybz");
             baseApproveInfo.setApplyFormId(applyFormId);
-            QueryWrapper<HybzApplyInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("APPLY_FORM_ID", applyFormId);
-            HybzApplyInfo hybzApplyInfo = hybzApplyInfoMapper.selectOne(queryWrapper);
             baseApproveInfo.setCreateUserId(hybzApplyInfo.getCreateUserId());
             baseApproveInfo.setCreateUserName(hybzApplyInfo.getCreateUserName());
             baseApproveInfo.setCreateUserPoliceNo(hybzApplyInfo.getCreateUserPoliceNo());

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

@@ -197,6 +197,12 @@ public class ZywwService {
      */
     @Transactional
     public boolean approveAndSaveApproveInfo(String applyFormId, String optFlag, String approveDesc, SysUser user){
+        QueryWrapper<ZywwApplyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("APPLY_FORM_ID", applyFormId);
+        ZywwApplyInfo zywwApplyInfo = zywwApplyInfoMapper.selectOne(queryWrapper);
+        if(zywwApplyInfo != null && "1".equals(zywwApplyInfo.getApproveStatusCode())){
+            throw new RuntimeException("数据库【住院慰问】申请信息记录已通过审批，不支持重复审批  申请单ID：" + applyFormId);
+        }
         // 审批一条【住院慰问】申请信息
         UpdateWrapper<ZywwApplyInfo> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("APPLY_FORM_ID", applyFormId);
@@ -211,9 +217,6 @@ public class ZywwService {
             BaseApproveInfo baseApproveInfo = new BaseApproveInfo();
             baseApproveInfo.setModuleCode("zyww");
             baseApproveInfo.setApplyFormId(applyFormId);
-            QueryWrapper<ZywwApplyInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("APPLY_FORM_ID", applyFormId);
-            ZywwApplyInfo zywwApplyInfo = zywwApplyInfoMapper.selectOne(queryWrapper);
             baseApproveInfo.setCreateUserId(zywwApplyInfo.getCreateUserId());
             baseApproveInfo.setCreateUserName(zywwApplyInfo.getCreateUserName());
             baseApproveInfo.setCreateUserPoliceNo(zywwApplyInfo.getCreateUserPoliceNo());