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/domain/ReviewDetails.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -11,6 +13,7 @@ import java.util.List;
 /**
  * 审查细则
  */
+@ApiModel
 @TableName(value ="t_review_details")
 @Data
 public class ReviewDetails {
@@ -18,28 +21,33 @@ public class ReviewDetails {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 文本内容
      */
+    @ApiModelProperty("文本内容")
     private String text;
 
     /**
      * 审查要点id
      */
+    @ApiModelProperty("审查要点id")
     private Long reviewKeypointId;
 
     /**
      * 审核场景列表
      */
+    @ApiModelProperty("审核场景列表")
     @TableField(exist = false)
     private List<ReviewScene> reviewSceneList;
 
     /**
      * 该明细的审查结果
      */
+    @ApiModelProperty("该明细的审查结果")
     @TableField(exist = false)
     private ReviewDetailsResult result;
 

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

@@ -4,44 +4,54 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  * 审查细则的审查结果
  * @TableName t_review_details_result
  */
+@ApiModel
 @TableName(value ="t_review_details_result")
 @Data
 public class ReviewDetailsResult implements Serializable {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 审核是否通过（0未通过、1通过）
      */
+    @ApiModelProperty("审核是否通过（0未通过、1通过）")
     private Integer passed;
 
     /**
      * 评论
      */
+    @ApiModelProperty("评论")
     private String comment;
 
     /**
      * 厂商适用于该细则的场景截图或照片（多个url用","分隔）
      */
+    @ApiModelProperty("厂商适用于该细则的场景截图或照片（多个url用\",\"分隔）")
     private String imagesUrl;
 
     /**
      * 关联到的细则id
      */
+    @ApiModelProperty("关联到的细则id")
     private Long reviewDetailsId;
 
     /**
      * 关联的任务id
      */
+    @ApiModelProperty("关联的任务id")
     private Long taskId;
 
 }
\ No newline at end of file

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -11,6 +13,7 @@ import java.util.List;
 /**
  * 审查要点
  */
+@ApiModel
 @TableName(value ="t_review_keypoint")
 @Data
 public class ReviewKeyPoint {
@@ -18,22 +21,26 @@ public class ReviewKeyPoint {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 文本内容
      */
+    @ApiModelProperty("文本内容")
     private String text;
 
     /**
      * 审查标准id
      */
+    @ApiModelProperty("审查标准id")
     private Long reviewStandardId;
 
     /**
      * 审查细则列表
      */
+    @ApiModelProperty("审查细则列表")
     @TableField(exist = false)
     private List<ReviewDetails> reviewDetailsList;
 

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

@@ -3,12 +3,15 @@ package com.ruoyi.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
  * 审查场景
  */
+@ApiModel
 @TableName(value ="t_review_scene")
 @Accessors(chain = true)
 @Data
@@ -17,17 +20,20 @@ public class ReviewScene {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 文本内容
      */
+    @ApiModelProperty("文本内容")
     private String text;
 
     /**
      * 审查细则id
      */
+    @ApiModelProperty("审查细则id")
     private Long reviewDetailsId;
 
 }

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -12,6 +15,7 @@ import lombok.experimental.Accessors;
  * 审查场景变更任务&用户映射关系
  * @TableName t_review_scene_change_task_user_relation
  */
+@ApiModel
 @TableName(value ="t_review_scene_change_task_user_relation")
 @Accessors(chain = true)
 @Data
@@ -25,42 +29,50 @@ public class ReviewSceneChangeTaskUserRelation {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 任务id
      */
+    @ApiModelProperty("任务id")
     private Long taskId;
 
     /**
      * 用户id
      */
+    @ApiModelProperty("用户id")
     private Long userId;
 
     /**
      * 审核意见（PASS、REJECT）
      */
+    @ApiModelProperty("审核意见（PASS、REJECT）")
     private String decision;
 
     /**
      * 评论
      */
+    @ApiModelProperty("评论")
     private String comment;
 
     /**
      * 审核时间
      */
+    @ApiModelProperty("审核时间")
     private Date decisionTime;
 
     /**
      * 用户姓名
      */
+    @ApiModelProperty("用户姓名")
     private String name;
 
     /**
      * 部门名称
      */
+    @ApiModelProperty("部门名称")
     private String dept;
 
 }
\ No newline at end of file

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -11,6 +13,7 @@ import java.util.List;
 /**
  * 审查标准
  */
+@ApiModel
 @TableName(value ="t_review_standard")
 @Data
 public class ReviewStandard {
@@ -18,24 +21,48 @@ public class ReviewStandard {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 章节
      */
+    @ApiModelProperty("章节")
     private String chapter;
 
 
     /**
      * 文本内容
      */
+    @ApiModelProperty("文本内容")
     private String text;
 
     /**
      * 要点列表
      */
+    @ApiModelProperty("要点列表")
     @TableField(exist = false)
     private List<ReviewKeyPoint> keyPointList;
 
+    /**
+     * 关联标准表id
+     */
+    private Long standardId;
+
+    /**
+     * 标准名称
+     */
+    private String name;
+
+    /**
+     * 标准号
+     */
+    private String standardNo;
+
+    /**
+     * 文件路径
+     */
+    private String file;
+
 }

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

+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 标准
+ * @TableName t_standard
+ */
+@ApiModel(value = "Standard", description = "标准")
+@TableName(value ="t_standard", autoResultMap = true)
+@Accessors(chain = true)
+@Data
+public class Standard {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 标准名称
+     */
+    @ApiModelProperty("标准名称")
+    private String name;
+
+    /**
+     * 标准号
+     */
+    @ApiModelProperty("标准号")
+    private String standardNo;
+
+    /**
+     * 文件路径
+     */
+    @ApiModelProperty("文件路径")
+    private String file;
+}

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

@@ -8,6 +8,8 @@ import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.StandardJsonTypeHandler;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -15,6 +17,7 @@ import lombok.experimental.Accessors;
  * 体系审查任务
  * @TableName t_system_review_task
  */
+@ApiModel
 @TableName(value ="t_system_review_task", autoResultMap = true)
 @Accessors(chain = true)
 @Data
@@ -33,68 +36,101 @@ public class SystemReviewTask {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 任务编号
      */
+    @ApiModelProperty("任务编号")
     private String taskNo;
 
     /**
      * 任务状态（NEW、PENDING、FINISH、CLOSE）
      */
+    @ApiModelProperty("任务状态（NEW、PENDING、FINISH、CLOSE）")
     private String taskStatus;
 
     /**
      * 任务发起人姓名
      */
+    @ApiModelProperty("任务发起人姓名")
     private String taskInitiator;
 
     /**
      * 任务发起人部门
      */
+    @ApiModelProperty("任务发起人部门")
     private String taskInitiatorDept;
 
     /**
      * 任务结果（PASS、REJECT）
      */
+    @ApiModelProperty("任务结果（PASS、REJECT）")
     private String taskResult;
 
     /**
      * 任务开始时间
      */
+    @ApiModelProperty("任务开始时间")
     private Date taskBeginTime;
 
     /**
      * 任务结束时间
      */
+    @ApiModelProperty("任务结束时间")
     private Date taskEndTime;
 
     /**
      * 审查标准
      */
+    @ApiModelProperty("审查标准")
     @TableField(value="standard", typeHandler = StandardJsonTypeHandler. class)
     private List<ReviewStandard> standard;
 
     /**
      * 占位（开发人员根据具体业务自行增加业务字段）
      */
+    @ApiModelProperty("占位（开发人员根据具体业务自行增加业务字段）")
     private String bizInfo;
 
     /**
      * 审核组长id
      */
+    @ApiModelProperty("审核组长id")
     private Long leaderId;
 
     /**
      * 审核组长姓名
      */
+    @ApiModelProperty("审核组长姓名")
     private String leader;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
+    /**
+     * 关联标准表id
+     */
+    private Long standardId;
+
+    /**
+     * 标准名称
+     */
+    private String name;
+
+    /**
+     * 标准号
+     */
+    private String standardNo;
+
+    /**
+     * 文件路径
+     */
+    private String file;
+
 }

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

@@ -3,6 +3,8 @@ package com.ruoyi.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -10,6 +12,7 @@ import lombok.experimental.Accessors;
  * 体系审查任务收件箱（目前用来获取审查场景变更通知）
  * @TableName t_system_review_task_inbox
  */
+@ApiModel
 @TableName(value ="t_system_review_task_inbox")
 @Accessors(chain = true)
 @Data
@@ -17,22 +20,26 @@ public class SystemReviewTaskInbox {
     /**
      * 主键
      */
+    @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
      * 体系审查任务id
      */
+    @ApiModelProperty("体系审查任务id")
     private Long systemReviewTaskId;
 
     /**
      * 场景变更任务id
      */
+    @ApiModelProperty("场景变更任务id")
     private Long reviewSceneChangeTaskId;
 
     /**
      * 该消息是否已确认(0未确认:1已确认)
      */
+    @ApiModelProperty("该消息是否已确认(0未确认:1已确认)")
     private Integer isConfirm;
 
 }
\ No newline at end of file

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,6 +13,7 @@ import lombok.experimental.Accessors;
  * 体系审查任务&用户映射关系
  * @TableName t_system_review_task_user_relation
  */
+@ApiModel
 @TableName(value ="t_system_review_task_user_relation")
 @Accessors(chain = true)
 @Data
@@ -19,22 +22,26 @@ public class SystemReviewTaskUserRelation {
     /**
      * 任务id
      */
+    @ApiModelProperty("任务id")
     @TableId(type = IdType.ASSIGN_ID)
     private Long taskId;
 
     /**
      * 用户id
      */
+    @ApiModelProperty("用户id")
     private Long userId;
 
     /**
      * 是否是组长（1是、0不是）
      */
+    @ApiModelProperty("是否是组长（1是、0不是）")
     private Integer isLeader;
 
     /**
      * 用户姓名
      */
+    @ApiModelProperty("用户姓名")
     private String name;
 
 }
\ No newline at end of file

quality-review/src/main/java/com/ruoyi/mapper/StandardMapper.java

+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.Standard;
+import com.ruoyi.web.request.StandardListRequest;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface StandardMapper extends BaseMapper<Standard> {
+
+    // 分页查询
+    List<Standard> findList(@Param("params") StandardListRequest request);
+}

quality-review/src/main/java/com/ruoyi/service/StandardService.java

+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.Standard;
+import com.ruoyi.web.request.StandardListRequest;
+
+import java.util.List;
+
+/**
+ * @description 针对表【t_standard(标准)】的数据库操作Service
+ */
+public interface StandardService extends IService<Standard> {
+
+    // 分页查询
+    List<Standard> findList(StandardListRequest request);
+}

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

+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.domain.Standard;
+import com.ruoyi.mapper.StandardMapper;
+import com.ruoyi.service.StandardService;
+import com.ruoyi.web.request.StandardListRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> implements StandardService {
+
+    @Autowired
+    private StandardMapper standardMapper;
+
+    /**
+     * 分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public List<Standard> findList(StandardListRequest request) {
+        return standardMapper.findList(request);
+    }
+}

quality-review/src/main/java/com/ruoyi/web/StandardController.java

+package com.ruoyi.web;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.domain.Standard;
+import com.ruoyi.service.StandardService;
+import com.ruoyi.web.request.ReviewSceneChangeTaskFindPendingRequest;
+import com.ruoyi.web.request.StandardListRequest;
+import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.skywalking.apm.toolkit.trace.Tag;
+import org.apache.skywalking.apm.toolkit.trace.Tags;
+import org.apache.skywalking.apm.toolkit.trace.Trace;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api("标准")
+@RestController
+@RequestMapping("/standard")
+public class StandardController extends BaseController {
+
+    @Autowired
+    private StandardService standardService;
+
+    /**
+     * 分页查询
+     * @return
+     */
+    @ApiOperation("分页查询")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/findStandardList")
+    public TableDataInfo<Standard> findList(@Validated @RequestBody StandardListRequest request) {
+        startPage(request);
+        return getDataTable(standardService.findList(request));
+    }
+}

quality-review/src/main/java/com/ruoyi/web/SystemReviewTaskController.java

@@ -3,12 +3,15 @@ package com.ruoyi.web;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.service.SystemReviewTaskService;
 import com.ruoyi.web.request.SystemReviewTaskCreateRequest;
 import com.ruoyi.web.request.SystemReviewTaskStartRequest;
 import com.ruoyi.web.request.SystemReviewTaskViewRequest;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.skywalking.apm.toolkit.trace.Tag;
 import org.apache.skywalking.apm.toolkit.trace.Tags;
 import org.apache.skywalking.apm.toolkit.trace.Trace;
@@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+@Api("体系审查任务")
 @RestController
 @RequestMapping("/system/review/task")
 public class SystemReviewTaskController extends BaseController {
@@ -26,28 +30,31 @@ public class SystemReviewTaskController extends BaseController {
     @Autowired
     private SystemReviewTaskService systemReviewTaskService;
 
+    @ApiOperation("创建体系审查任务")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @Log(title = "体系审查任务", businessType = BusinessType.INSERT)
     @RequestMapping(method = RequestMethod.POST, value = "/create")
-    public AjaxResult create(@Validated @RequestBody SystemReviewTaskCreateRequest request) {
+    public R<String> create(@Validated @RequestBody SystemReviewTaskCreateRequest request) {
         systemReviewTaskService.createTaskTest(request);
-        return success();
+        return R.ok();
     }
 
+    @ApiOperation("查看体系审查任务详情")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/view")
-    public AjaxResult view(@Validated @RequestBody SystemReviewTaskViewRequest request) {
+    public R<SystemReviewTaskViewResponse> view(@Validated @RequestBody SystemReviewTaskViewRequest request) {
         SystemReviewTaskViewResponse systemReviewTaskViewResponse = systemReviewTaskService.view(request.getTaskId());
-        return AjaxResult.success(systemReviewTaskViewResponse);
+        return R.ok(systemReviewTaskViewResponse);
     }
 
+    @ApiOperation("启动体系审查任务")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/start")
-    public AjaxResult start(@Validated @RequestBody SystemReviewTaskStartRequest request) {
+    public R<String> start(@Validated @RequestBody SystemReviewTaskStartRequest request) {
         systemReviewTaskService.start(request);
-        return AjaxResult.success();
+        return R.ok();
     }
 }

quality-review/src/main/java/com/ruoyi/web/request/StandardListRequest.java

+package com.ruoyi.web.request;
+
+import com.ruoyi.common.core.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "StandardListRequest", description = "查询标准")
+@Data
+public class StandardListRequest extends PageDomain {
+
+    /**
+     * 标准名称
+     */
+    @ApiModelProperty("标准名称")
+    private String name;
+
+    /**
+     * 标准号
+     */
+    @ApiModelProperty("标准号")
+    private String standardNo;
+}

quality-review/src/main/java/com/ruoyi/web/request/SystemReviewTaskCreateRequest.java

@@ -12,4 +12,10 @@ public class SystemReviewTaskCreateRequest {
 
     private List<SystemReviewTaskUserRelation> auditors;
 
+    /**
+     * 标准id
+     * 根据哪个标准新建的审查任务
+     */
+    private Long standardId;
+
 }

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

@@ -2,21 +2,26 @@ package com.ruoyi.web.response;
 
 import com.ruoyi.domain.ReviewSceneChangeTask;
 import com.ruoyi.domain.SystemReviewTask;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
+@ApiModel(value = "SystemReviewTaskViewResponse", description = "查询体系审查任务详情响应体")
 @Data
 public class SystemReviewTaskViewResponse {
 
     /**
      * 任务信息
      */
+    @ApiModelProperty("任务信息")
     private SystemReviewTask systemReviewTask;
 
     /**
      * 任务开始后的场景变更信息
      */
+    @ApiModelProperty("任务开始后的场景变更信息")
     private List<ReviewSceneChangeTask> reviewSceneChangeTasks;
 
 }

quality-review/src/main/resources/mapper/ReviewStandardMapper.xml

@@ -9,6 +9,10 @@
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="chapter" column="chapter" jdbcType="VARCHAR"/>
         <result property="text" column="text" jdbcType="VARCHAR"/>
+        <result property="standardId" column="standard_id" jdbcType="BIGINT"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
+        <result property="file" column="file" jdbcType="VARCHAR"/>
 
         <collection property="keyPointList" ofType="com.ruoyi.domain.ReviewKeyPoint" select="com.ruoyi.mapper.ReviewKeyPointMapper.findAllByReviewStandardId" column="id">
             <result property="id" column="u_id" jdbcType="BIGINT"/>
@@ -18,7 +22,7 @@
     </resultMap>
 
     <select id="findTree" resultMap="StandardTreeResultMap">
-        SELECT id, chapter, text FROM t_review_standard;
+        SELECT id, chapter, text, standard_id, name, standard_no, file FROM t_review_standard;
     </select>
 
 

quality-review/src/main/resources/mapper/StandardMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mapper.StandardMapper">
+
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.Standard">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
+        <result property="file" column="file" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="findList" parameterType="com.ruoyi.domain.Standard" resultMap="BaseResultMap">
+        SELECT id, name, standard_no, file
+        FROM t_standard
+        <where>
+            <if test="params.name != null and params.name != ''">
+                name like concat('%',#{params.name},'%')
+            </if>
+            <if test="params.standardNo != null and params.standardNo != ''">
+                standard_no = #{params.standardNo}
+            </if>
+        </where>
+    </select>
+
+</mapper>

quality-review/src/main/resources/mapper/SystemReviewTaskMapper.xml

@@ -16,10 +16,14 @@
             <result property="standard" column="standard" typeHandler="com.ruoyi.common.StandardJsonTypeHandler"/>
             <result property="bizInfo" column="biz_info" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="standardId" column="standard_id" jdbcType="BIGINT"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
+            <result property="file" column="file" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="findListByStatus" resultMap="BaseResultMap">
-        SELECT id, task_no, task_status, task_initiator, task_initiator_dept, task_result, task_begin_time, task_end_time, standard, biz_info, create_time
+        SELECT id, task_no, task_status, task_initiator, task_initiator_dept, task_result, task_begin_time, task_end_time, standard, biz_info, create_time, standard_id, name, standard_no, file
         FROM t_system_review_task WHERE task_status = #{status}
     </select>