Commit 7e72b199 authored by 王飞's avatar 王飞

Feat

1、查询审查任务详情时冗余细则信息便于前端显示。

Reference N/A
parent 187423d6
...@@ -57,22 +57,26 @@ public class ReviewDetails { ...@@ -57,22 +57,26 @@ public class ReviewDetails {
/** /**
* 冗余标准id (为便于前端显示) * 冗余标准id (为便于前端显示)
*/ */
@ApiModelProperty("标准id")
@JsonFormat(shape = JsonFormat.Shape.STRING) @JsonFormat(shape = JsonFormat.Shape.STRING)
@TableField(exist = false) @TableField(exist = false)
private Long standardId; private Long standardId;
/** /**
* 冗余审查标准内容 (为便于前端显示) * 冗余审查标准内容 (为便于前端显示)
*/ */
@ApiModelProperty("标准内容")
@TableField(exist = false) @TableField(exist = false)
private String standardText; private String standardText;
/** /**
* 冗余章节 (为便于前端显示) * 冗余章节 (为便于前端显示)
*/ */
@ApiModelProperty("章节")
@TableField(exist = false) @TableField(exist = false)
private String chapter; private String chapter;
/** /**
* 冗余审查要点内容 (为便于前端显示) * 冗余审查要点内容 (为便于前端显示)
*/ */
@ApiModelProperty("要点内容")
@TableField(exist = false) @TableField(exist = false)
private String reviewKeypointText; private String reviewKeypointText;
......
...@@ -81,24 +81,4 @@ public class ReviewStandard { ...@@ -81,24 +81,4 @@ public class ReviewStandard {
@ApiModelProperty("文件路径") @ApiModelProperty("文件路径")
private String file; private String file;
/**
* 冗余细则集合(便于前端显示)
* @return
*/
@TableField(exist = false)
private List<ReviewDetails> details;
public List<ReviewDetails> getDetails() {
List<ReviewDetails> reviewDetailsList = new ArrayList();
for(ReviewKeyPoint reviewKeyPoint : keyPointList) {
for(ReviewDetails reviewDetails : reviewKeyPoint.getReviewDetailsList()) {
reviewDetailsList.add(reviewDetails);
}
}
return reviewDetailsList;
}
} }
package com.ruoyi.web.response; package com.ruoyi.web.response;
import com.ruoyi.domain.ReviewSceneChangeTask; import com.ruoyi.domain.*;
import com.ruoyi.domain.SystemReviewTask;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@ApiModel(value = "SystemReviewTaskViewResponse", description = "查询体系审查任务详情响应体") @ApiModel(value = "SystemReviewTaskViewResponse", description = "查询体系审查任务详情响应体")
...@@ -24,4 +24,23 @@ public class SystemReviewTaskViewResponse { ...@@ -24,4 +24,23 @@ public class SystemReviewTaskViewResponse {
@ApiModelProperty("任务开始后的场景变更信息") @ApiModelProperty("任务开始后的场景变更信息")
private List<ReviewSceneChangeTask> reviewSceneChangeTasks; 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;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment