Merge branch 'wangdingyi' into 'dev'

问卷详情

See merge request !119

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

@@ -166,6 +166,28 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
 
         Map<Long, ReviewDetailsResult> resultMap = results.stream().collect(Collectors.toMap(ReviewDetailsResult::getReviewDetailsId, Function.identity(), (v1, v2) -> v1));
 
+        for(ReviewStandard standard : standards) {
+            standard.setPassed(ReviewStandard.PASSED);
+            List<ReviewKeyPoint> keyPointList = standard.getKeyPointList();
+
+            for(ReviewKeyPoint keypoint : keyPointList) {
+                List<ReviewDetails> reviewDetailsList = keypoint.getReviewDetailsList();
+
+                for(ReviewDetails details : reviewDetailsList) {
+                    ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
+                    if(reviewDetailsResult == null || Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
+                        standard.setPassed(ReviewStandard.NO_PASSED);
+                    }
+                    if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
+                        ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
+                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                    }
+                    details.setResult(reviewDetailsResult);
+                }
+            }
+        }
+
+
         List<TaskUserRelation> relationList = taskUserRelationMapper.selectQTeamMembers(taskMapper.findByCarReviewTaskId(carReviewTask.getId()));
 
         carReviewTask.setStandards(calculateStandards(standards));

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

@@ -162,6 +162,27 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
 
         Map<Long, ReviewDetailsResult> resultMap = results.stream().collect(Collectors.toMap(ReviewDetailsResult::getReviewDetailsId, Function.identity(), (v1, v2) -> v1));
 
+        for(ReviewStandard standard : standards) {
+            standard.setPassed(ReviewStandard.PASSED);
+            List<ReviewKeyPoint> keyPointList = standard.getKeyPointList();
+
+            for(ReviewKeyPoint keypoint : keyPointList) {
+                List<ReviewDetails> reviewDetailsList = keypoint.getReviewDetailsList();
+
+                for(ReviewDetails details : reviewDetailsList) {
+                    ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
+                    if(reviewDetailsResult == null || Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
+                        standard.setPassed(ReviewStandard.NO_PASSED);
+                    }
+                    if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
+                        ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
+                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                    }
+                    details.setResult(reviewDetailsResult);
+                }
+            }
+        }
+
         List<TaskUserRelation> relationList = taskUserRelationMapper.selectQTeamMembers(taskMapper.findBySystemReviewTaskId(systemReviewTask.getId()));
 
         systemReviewTask.setStandards(calculateStandards(standards));