驳回、审核、专家审核、组合审核bug修改

src/main/java/com/bootdo/datas/controller/DataController.java

@@ -197,6 +197,7 @@ public class DataController {
     @RequiresPermissions("datas:data:verify")
     public R batchVerify(@RequestParam("ids[]") Long[] ids) {
         log.info("批量审核通过 ids:" + ids.toString());
+        List<String> failedDataNames = new ArrayList<>();
         for (Long id : ids) {
             log.info("审核通过 id:" + id);
             GyDataImportDTO data = new GyDataImportDTO();
@@ -209,8 +210,13 @@ public class DataController {
                 data.setId(id);
                 data.setDataStatus("3");
                 gyDataService.updateStatus(data);
-            }
+            } else {
+            failedDataNames.add(data.getDataName());
         }
+    }
+        if (failedDataNames.size() > 0) {
+        return R.error(String.join(",", failedDataNames) + ",审核失败");
+    }
         return R.ok();
     }
 

src/main/java/com/bootdo/datas/controller/DataExpertController.java

@@ -197,6 +197,7 @@ public class DataExpertController {
     @RequiresPermissions("datas:expertVerify:rebut")
     public R batchRebut(@RequestParam("ids[]") Long[] ids) {
         log.info("审核通过 备案主键 ids:" + ids);
+        List<String> failedDataNames = new ArrayList<>();
         for (Long id : ids) {
             log.info("审核通过 id:" + id);
             GyDataImportDTO data = new GyDataImportDTO();
@@ -208,8 +209,13 @@ public class DataExpertController {
                 data.setId(id);
                 data.setDataStatus("4");
                 gyDataService.updateStatus(data);
+            } else {
+                failedDataNames.add(data.getDataName());
             }
         }
+        if (failedDataNames.size() > 0) {
+            return R.error(String.join(",", failedDataNames) + ",专家审核失败");
+        }
         return R.ok();
     }
 

src/main/java/com/bootdo/datas/controller/DataUnionController.java

@@ -77,7 +77,7 @@ public class DataUnionController {
             query.put("nextVerifyDept", String.valueOf(currUser.getDeptId()));
         }
         String dataStatus = (String) params.get("dataStatus");
-        if(StringUtils.isNotEmpty(dataStatus)) {
+        if (StringUtils.isNotEmpty(dataStatus)) {
             query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
         }
         query.put("sendVerify", "3");
@@ -105,10 +105,10 @@ public class DataUnionController {
     }
 
     /**
+     * @param id
      * @Description: 列表页面 审核通过
      * @Author: wangp
      * @Date: 2022/3/6 16:35
-     * @param id
      * @Return: R
      */
     @PostMapping("/verify")
@@ -125,10 +125,10 @@ public class DataUnionController {
     }
 
     /**
+     * @param ids
      * @Description: 批量审核
      * @Author: wangp
      * @Date: 2022/3/6 16:35
-     * @param ids
      * @Return: R
      */
     @PostMapping("/batchVerify")
@@ -136,6 +136,7 @@ public class DataUnionController {
     @RequiresPermissions("datas:unionVerify:verify")
     public R batchVerify(@RequestParam("ids[]") Long[] ids) {
         log.info("批量审核通过 ids:" + ids.toString());
+        List<String> failedDataNames = new ArrayList<>();
         for (Long id : ids) {
             log.info("审核通过 id:" + id);
             GyDataImportDTO data = new GyDataImportDTO();
@@ -147,11 +148,17 @@ public class DataUnionController {
                 data.setId(id);
                 data.setDataStatus("3");
                 gyDataService.updateStatus(data);
+            } else {
+                failedDataNames.add(data.getDataName());
             }
         }
+        if (failedDataNames.size() > 0) {
+            return R.error(String.join(",", failedDataNames) + ",联合审核失败");
+        }
         return R.ok();
     }
 
+
     /**
      * @Description: 列表页面 驳回
      * @Author: wangp

src/main/java/com/bootdo/datas/controller/DataVerifyController.java

@@ -187,6 +187,7 @@ public class DataVerifyController {
     @RequiresPermissions("datas:dataVerify:rebut")
     public R batchRebut(@RequestParam("ids[]") Long[] ids) {
         log.info("审核驳回 备案主键 ids:" + ids);
+        List<String> failedDataNames = new ArrayList<>();
         for (Long id : ids) {
             log.info("审核驳回 id:" + id);
             GyDataImportDTO data = new GyDataImportDTO();
@@ -198,8 +199,14 @@ public class DataVerifyController {
                 data.setId(id);
                 data.setDataStatus("4");
                 gyDataService.updateStatus(data);
+            }else {
+                failedDataNames.add(data.getDataName());
             }
         }
+        if (failedDataNames.size() > 0) {
+            return R.error(String.join(",", failedDataNames) + ",驳回失败");
+        }
+
         return R.ok();
     }
 

src/main/java/com/bootdo/datas/dto/GyDataImportDTO.java

@@ -24,7 +24,7 @@ public class GyDataImportDTO {
     /**
      * 所属监管部门
      */
-    private  String supervisoryOrg;
+    private String supervisoryOrg;
 
     /**
      * 数据处理者性质
@@ -1083,4 +1083,5 @@ public class GyDataImportDTO {
                 ", auditStage='" + auditStage + '\'' +
                 '}';
     }
+
 }