Merge branch 'dev' into 'master'

dev - master 25

See merge request !368

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -871,35 +871,38 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
                     Integer unprocessedNum = 0;
 
-                    for (CaseStatisticsVO vo : statisticsVOList) {
-                        // 忽略
-                        if (Objects.equals(vo.getStatus(), "IGNORED")) {
-                            ignoredNum = vo.getCount();
-                        }
-                        if (Objects.equals(vo.getStatus(), "PASSED")) {
-                            // 测试通过
-                            response.setTestDetailsPassNum(vo.getCount());
-                        }
-                        if (Objects.equals(vo.getStatus(), "FAILED")) {
-                            // 测试未通过
-                            response.setTestDetailsNoPassNum(vo.getCount());
+                    if (statisticsVOList != null) {
+                        for (CaseStatisticsVO vo : statisticsVOList) {
+                            // 忽略
+                            if (Objects.equals(vo.getStatus(), "IGNORED")) {
+                                ignoredNum = vo.getCount();
+                            }
+                            if (Objects.equals(vo.getStatus(), "PASSED")) {
+                                // 测试通过
+                                response.setTestDetailsPassNum(vo.getCount());
+                            }
+                            if (Objects.equals(vo.getStatus(), "FAILED")) {
+                                // 测试未通过
+                                response.setTestDetailsNoPassNum(vo.getCount());
+                            }
+                            // 处理中
+                            if (Objects.equals(vo.getStatus(), "PROCESSING")) {
+                                processingNum = vo.getCount();
+                            }
+                            // 未处理
+                            if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
+                                unprocessedNum = vo.getCount();
+                            }
                         }
-                        // 处理中
-                        if (Objects.equals(vo.getStatus(), "PROCESSING")) {
-                            processingNum = vo.getCount();
-                        }
-                        // 未处理
-                        if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
-                            unprocessedNum = vo.getCount();
-                        }
-                    }
 
-                    // 执行未完成
-                    response.setTestDetailsUnderNum(processingNum + unprocessedNum);
+                        // 执行未完成
+                        response.setTestDetailsUnderNum(processingNum + unprocessedNum);
+
+                        // 测试通过率
+                        BigDecimal num = new BigDecimal(((double) response.getTestDetailsPassNum() / response.getTestDetails()) * 100);
+                        response.setTestDetailsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
+                    }
 
-                    // 测试通过率
-                    BigDecimal num = new BigDecimal(((double) response.getTestDetailsPassNum() / response.getTestDetails()) * 100);
-                    response.setTestDetailsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
                 }
 
                 // 合规维度
@@ -915,35 +918,38 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
                     Integer unprocessedNum = 0;
 
-                    for (CaseStatisticsVO vo : statisticsVOList) {
-                        // 忽略
-                        if (Objects.equals(vo.getStatus(), "IGNORED")) {
-                            ignoredNum = vo.getCount();
-                        }
-                        if (Objects.equals(vo.getStatus(), "PASSED")) {
-                            // 测试通过
-                            response.setTestStandardsPassNum(vo.getCount());
-                        }
-                        if (Objects.equals(vo.getStatus(), "FAILED")) {
-                            // 测试未通过
-                            response.setTestStandardsNoPassNum(vo.getCount());
+                    if (statisticsVOList != null) {
+                        for (CaseStatisticsVO vo : statisticsVOList) {
+                            // 忽略
+                            if (Objects.equals(vo.getStatus(), "IGNORED")) {
+                                ignoredNum = vo.getCount();
+                            }
+                            if (Objects.equals(vo.getStatus(), "PASSED")) {
+                                // 测试通过
+                                response.setTestStandardsPassNum(vo.getCount());
+                            }
+                            if (Objects.equals(vo.getStatus(), "FAILED")) {
+                                // 测试未通过
+                                response.setTestStandardsNoPassNum(vo.getCount());
+                            }
+                            // 处理中
+                            if (Objects.equals(vo.getStatus(), "PROCESSING")) {
+                                processingNum = vo.getCount();
+                            }
+                            // 未处理
+                            if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
+                                unprocessedNum = vo.getCount();
+                            }
                         }
-                        // 处理中
-                        if (Objects.equals(vo.getStatus(), "PROCESSING")) {
-                            processingNum = vo.getCount();
-                        }
-                        // 未处理
-                        if (Objects.equals(vo.getStatus(), "UNPROCESSED")) {
-                            unprocessedNum = vo.getCount();
-                        }
-                    }
 
-                    // 执行未完成
-                    response.setTestStandardsUnderNum(processingNum + unprocessedNum);
+                        // 执行未完成
+                        response.setTestStandardsUnderNum(processingNum + unprocessedNum);
+
+                        // 测试通过率
+                        BigDecimal num = new BigDecimal(((double) response.getTestStandardsPassNum() / response.getTestStandards()) * 100);
+                        response.setTestStandardsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
+                    }
 
-                    // 测试通过率
-                    BigDecimal num = new BigDecimal(((double) response.getTestStandardsPassNum() / response.getTestStandards()) * 100);
-                    response.setTestStandardsPass(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
                 }
             }