Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/domain/ReviewDetails.java

@@ -54,4 +54,31 @@ public class ReviewDetails {
     @TableField(exist = false)
     private ReviewDetailsResult result;
 
+
+    /**
+     * 冗余标准id （为便于前端显示）
+     */
+    @ApiModelProperty("标准id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @TableField(exist = false)
+    private Long standardId;
+    /**
+     * 冗余审查标准内容 （为便于前端显示）
+     */
+    @ApiModelProperty("标准内容")
+    @TableField(exist = false)
+    private String standardText;
+    /**
+     * 冗余章节 （为便于前端显示）
+     */
+    @ApiModelProperty("章节")
+    @TableField(exist = false)
+    private String chapter;
+    /**
+     * 冗余审查要点内容 （为便于前端显示）
+     */
+    @ApiModelProperty("要点内容")
+    @TableField(exist = false)
+    private String reviewKeypointText;
+
 }

quality-review/src/main/java/com/ruoyi/domain/ReviewStandard.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**

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

@@ -180,6 +180,7 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
 
             for(ReviewDetails reviewDetails : reviewDetailsList) {
                 if(reviewDetails.getReviewKeypointId().equals(keyPointId)) {
+                    reviewDetails.setReviewKeypointText(reviewKeyPoint.getText());
                     children.add(reviewDetails);
                 }
             }
@@ -208,6 +209,14 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
 
             for(ReviewKeyPoint reviewKeyPoint : reviewKeyPointList) {
                 if(reviewKeyPoint.getReviewStandardId().equals(standardId)) {
+
+                    // 为该要点下的所有细则冗余标准信息，便于前端显示
+                    reviewKeyPoint.getReviewDetailsList().stream().forEach(details -> {
+                        details.setStandardText(reviewStandard.getText());
+                        details.setStandardId(reviewStandard.getId());
+                        details.setChapter(reviewStandard.getChapter());
+                    });
+
                     children.add(reviewKeyPoint);
                 }
             }

quality-review/src/main/java/com/ruoyi/web/response/SystemReviewTaskViewResponse.java

 package com.ruoyi.web.response;
 
-import com.ruoyi.domain.ReviewSceneChangeTask;
-import com.ruoyi.domain.SystemReviewTask;
+import com.ruoyi.domain.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @ApiModel(value = "SystemReviewTaskViewResponse", description = "查询体系审查任务详情响应体")
@@ -24,4 +24,23 @@ public class SystemReviewTaskViewResponse {
     @ApiModelProperty("任务开始后的场景变更信息")
     private List<ReviewSceneChangeTask> reviewSceneChangeTasks;
 
+    /**
+     *
+     * @return
+     */
+    @ApiModelProperty("细则列表")
+    public List<ReviewDetails> getDetailsList() {
+
+        List<ReviewDetails> detailsList = new ArrayList();
+
+        for(ReviewStandard standard : systemReviewTask.getStandard()) {
+            for(ReviewKeyPoint keyPoint : standard.getKeyPointList()) {
+                for(ReviewDetails details : keyPoint.getReviewDetailsList()) {
+                    detailsList.add(details);
+                }
+            }
+        }
+
+        return detailsList;
+    }
 }