Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang

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

@@ -53,7 +53,7 @@ public class DataStatisticsUtils {
         for(ReviewStandard standard : standards) {
 
             List<ReviewDetails> details = getDetailsByStandard(standard);
-            boolean isPass = true;
+            boolean isPass = false;
 
             for(ReviewDetails reviewDetails : details) {
 

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

@@ -171,9 +171,12 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
 
                 for(ReviewDetails details : reviewDetailsList) {
                     ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
-                    if(reviewDetailsResult == null || Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
+                    if(reviewDetailsResult != null && Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
                         standard.setPassed(ReviewStandard.NO_PASSED);
                     }
+                    if(reviewDetailsResult == null) {
+                        standard.setPassed(null);
+                    }
                     if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
                         ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
                         reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());

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

@@ -170,9 +170,12 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
 
                 for(ReviewDetails details : reviewDetailsList) {
                     ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
-                    if(reviewDetailsResult == null || Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
+                    if(reviewDetailsResult != null && Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
                         standard.setPassed(ReviewStandard.NO_PASSED);
                     }
+                    if(reviewDetailsResult == null) {
+                        standard.setPassed(null);
+                    }
                     if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
                         ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
                         reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());