Эх сурвалжийг харах

业务模块接口测试,代码修复

fangtasyj 6 сар өмнө
parent
commit
43293313fb

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

@@ -24,7 +24,6 @@ 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;
 
 @Slf4j
@@ -253,10 +252,12 @@ public class DbjzService {
                 throw new RuntimeException("数据库【大病救助】申请信息记录未插入  申请单ID:" + applyFormId);
             }
         } else {   // 修改操作
+            if("1".equals(dbDbjzApplyInfo.getApproveStatusCode())){
+                throw new RuntimeException("数据库【大病救助】申请信息记录已通过审批,不支持修改  申请单ID:" + applyFormId);
+            }
             // 根据申请单ID和dbjzApplyInfo对象中的当前属性值去修改当前申请记录
             UpdateWrapper<DbjzApplyInfo> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("APPLY_FORM_ID", applyFormId);
-//            dbjzApplyInfo.setUpdateTime(new Date());
             int updateRows = dbjzApplyInfoMapper.update(dbjzApplyInfo, updateWrapper);
             if(updateRows > 0){
                 log.info("【大病救助】申请信息修改成功  申请单ID:{}", applyFormId);

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

@@ -24,7 +24,6 @@ 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;
 
 @Slf4j
@@ -262,10 +261,12 @@ public class HybzService {
                 throw new RuntimeException("数据库【会员保障】申请信息记录未插入  申请单ID:" + applyFormId);
             }
         } else {   // 修改操作
+            if("1".equals(dbHybzApplyInfo.getApproveStatusCode())){
+                throw new RuntimeException("数据库【会员保障】申请信息记录已通过审批,不支持修改  申请单ID:" + applyFormId);
+            }
             // 根据申请单ID和hybzApplyInfo对象中的当前属性值去修改当前申请记录
             UpdateWrapper<HybzApplyInfo> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("APPLY_FORM_ID", applyFormId);
-//            hybzApplyInfo.setUpdateTime(new Date());
             int updateRows = hybzApplyInfoMapper.update(hybzApplyInfo, updateWrapper);
             if(updateRows > 0){
                 log.info("【会员保障】申请信息修改成功  申请单ID:{}", applyFormId);

+ 5 - 2
ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/controller/ZdcxController.java

@@ -11,6 +11,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequestMapping("/api/zdcx")
@@ -93,11 +96,11 @@ public class ZdcxController {
     @PostMapping("/delete")
     public JSONObject delete(@RequestBody JSONObject reqBody){
         String docIds = reqBody.getString("docIds");
-        if(StringUtils.isBlank(docIds) || docIds.split(",").length == 0){
+        if(StringUtils.isBlank(docIds) || Arrays.asList(docIds.split(",")).size() == 0){
             return RspResult.error("docIds参数为空");
         }
         try {
-            return zdcxService.delDataByDocId(docIds.split(","))? RspResult.success(true) : RspResult.error("制度规范信息删除失败 - 删除失败的文书号:[" + docIds + "]");
+            return zdcxService.delDataByDocId(Arrays.asList(docIds.split(",")))? RspResult.success(true) : RspResult.error("制度规范信息删除失败 - 删除失败的文书号:[" + docIds + "]");
         } catch (Exception e){
             log.error("制度规范信息删除失败", e);
             return RspResult.error("制度规范信息删除失败 - " + e.getMessage());

+ 14 - 14
ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/service/ZdcxService.java

@@ -16,6 +16,7 @@ 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 java.util.List;
 
 @Slf4j
 @Service
@@ -160,13 +161,16 @@ public class ZdcxService {
     public boolean updateStandardInfo(Zdcx zdcx){
         String docId = zdcx.getDocId();
         UpdateWrapper<Zdcx> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("DOC_ID", docId);
-        int updateRows = zdcxMapper.update(zdcx, updateWrapper);
+        updateWrapper.eq("DOC_ID", docId)
+                .set("TITLE", zdcx.getTitle())
+                .set("PUBLISH_DEPT", zdcx.getPublishDept())
+                .set("CONTENT", zdcx.getContent());
+        int updateRows = zdcxMapper.update(null, updateWrapper);
         if(updateRows > 0){
             log.info("【制度查询】制度规范信息修改成功  文书号:{}", docId);
             return true;
         } else {
-            throw new RuntimeException("数据库【制度查询】制度规范信息记录未修改  文书号:" + docId);
+            throw new RuntimeException("数据库【制度查询】制度规范信息记录未修改或不存在  文书号:" + docId);
         }
     }
 
@@ -177,19 +181,15 @@ public class ZdcxService {
      * @return
      */
     @Transactional
-    public boolean delDataByDocId(String[] docIds){
-        int delRowsCount = 0;
-        for (String docId : docIds) {
-            QueryWrapper<Zdcx> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("DOC_ID", docId);
-            int delRows = zdcxMapper.delete(queryWrapper);
-            delRowsCount += delRows;
-        }
-        if(delRowsCount == docIds.length){
-            log.info("制度规范信息删除成功  已删除的文书号:{},删除的数据条数:{}", docIds.toString(), delRowsCount);
+    public boolean delDataByDocId(List<String> docIds){
+        QueryWrapper<Zdcx> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("DOC_ID", docIds);
+        int delRows = zdcxMapper.delete(queryWrapper);
+        if(delRows == docIds.size()){
+            log.info("制度规范信息删除成功  已删除的文书号:{},删除的数据条数:{}", docIds, delRows);
             return true;
         } else {
-            throw new RuntimeException("数据库制度规范信息记录未删除或不存在  删除失败的文书号:" + docIds.toString());
+            throw new RuntimeException("数据库制度规范信息记录未删除或不存在  删除失败的文书号:" + docIds);
         }
     }
 

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

@@ -172,10 +172,12 @@ public class ZywwService {
                 throw new RuntimeException("数据库【住院慰问】申请信息记录未插入  申请单ID:" + applyFormId);
             }
         } else {   // 修改操作
+            if("1".equals(dbZywwApplyInfo.getApproveStatusCode())){
+                throw new RuntimeException("数据库【住院慰问】申请信息记录已通过审批,不支持修改  申请单ID:" + applyFormId);
+            }
             // 根据申请单ID和zywwApplyInfo对象中的当前属性值去修改当前申请记录
             UpdateWrapper<ZywwApplyInfo> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("APPLY_FORM_ID", applyFormId);
-//            zywwApplyInfo.setUpdateTime(new Date());
             int updateRows = zywwApplyInfoMapper.update(zywwApplyInfo, updateWrapper);
             if(updateRows > 0){
                 log.info("【住院慰问】申请信息修改成功  申请单ID:{}", applyFormId);