Merge branch 'wangdingyi' into 'dev'

数据统计

See merge request !152

quality-review/src/main/java/com/ruoyi/common/DataStatisticsUtils.java

@@ -62,8 +62,8 @@ public class DataStatisticsUtils {
                     isPass = false;
                 }
 
-                if(passed == ReviewStandard.PASSED) {
-                    isPass = false;
+                if(passed == ReviewStandard.NO_PASSED) {
+                    isPass = true;
                 }
 
 

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

@@ -582,32 +582,42 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     public DataStatisticsResponse dataStatistics(TaskGetInfoRequest request) {
 
         Task task = taskMapper.selectById(request.getId());
+        DataStatisticsResponse response = new DataStatisticsResponse();
 
-        SystemReviewTask systemReviewTask = systemReviewTaskMapper.selectById(task.getSystemReviewTaskId());
+        if (task.getSystemReviewTaskId() != null) {
 
-        CarReviewTask carReviewTask = carReviewTaskMapper.selectById(task.getCarReviewTaskId());
+            SystemReviewTask systemReviewTask = systemReviewTaskMapper.selectById(task.getSystemReviewTaskId());
+            // 获取最新问卷
+            List<ReviewStandard> standardTree = reviewStandardService.findTree(systemReviewTask.getStandardId(), ReviewStandard.TYPE_SYSTEM);
 
-        DataStatisticsResponse response = new DataStatisticsResponse();
+            // 获取当前问卷答案
+            List<ReviewDetailsResult> results = reviewDetailsResultService.findByTaskId(systemReviewTask.getId());
+
+            // 体系审查
+            setSystemDataStatistics(standardTree,results,response);
+
+            return response;
+        }
+
+        if (task.getCarReviewTaskId() != null) {
 
-        // 获取最新问卷
-        List<ReviewStandard> standardTree = reviewStandardService.findTree(systemReviewTask.getStandardId(), ReviewStandard.TYPE_SYSTEM);
+            CarReviewTask carReviewTask = carReviewTaskMapper.selectById(task.getCarReviewTaskId());
 
-        // 获取当前问卷答案
-        List<ReviewDetailsResult> results = reviewDetailsResultService.findByTaskId(systemReviewTask.getId());
+            // 获取最新问卷
+            List<ReviewStandard> carStandardTree = reviewStandardService.findTree(carReviewTask.getStandardId(), ReviewStandard.TYPE_CAR);
 
-        // 体系审查
-        setSystemDataStatistics(standardTree,results,response);
+            // 获取当前问卷答案
+            List<ReviewDetailsResult> carResults = reviewDetailsResultService.findByTaskId(carReviewTask.getId());
 
-        // 获取最新问卷
-        List<ReviewStandard> carStandardTree = reviewStandardService.findTree(carReviewTask.getStandardId(), ReviewStandard.TYPE_CAR);
+            // 车型审查
+            setCarDataStatistics(carStandardTree,carResults,response);
 
-        // 获取当前问卷答案
-        List<ReviewDetailsResult> carResults = reviewDetailsResultService.findByTaskId(carReviewTask.getId());
+            return response;
+
+        }
 
-        // 车型审查
-        setCarDataStatistics(carStandardTree,carResults,response);
+        return null;
 
-        return response;
     }