Merge branch 'dev' into wangfei

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

@@ -44,4 +44,16 @@ public class Standard {
      */
     @ApiModelProperty("文件路径")
     private String file;
+
+    /**
+     * 符合
+     */
+    @ApiModelProperty("符合")
+    private String conformity;
+
+    /**
+     * 不符合
+     */
+    @ApiModelProperty("不符合")
+    private String inconformity;
 }

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

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("车辆审查任务")
+@Api(tags = {"车辆审查任务"})
 @RestController
 @RequestMapping("/car/review/task")
 public class CarReviewTaskController extends BaseController {

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("审查细则的审查结果")
+@Api(tags = "审查细则的审查结果")
 @RestController
 @RequestMapping("/review/details/result")
 public class ReviewDetailsResultController extends BaseController {
@@ -26,10 +26,10 @@ public class ReviewDetailsResultController extends BaseController {
     @Autowired
     private ReviewDetailsResultService reviewDetailsResultService;
 
-    @ApiOperation("保存审查结果")
+    @ApiOperation("保存问卷审查结果（每题）")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
-    @Log(title = "保存审查结果", businessType = BusinessType.INSERT)
+    @Log(title = "保存问卷审查结果", businessType = BusinessType.INSERT)
     @RequestMapping(method = RequestMethod.POST, value = "/save")
     public R<String> save(@Validated @RequestBody ReviewDetailsResultSaveRequest request) {
         reviewDetailsResultService.save(request);

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

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("场景变更任务")
+@Api(tags = "场景变更任务")
 @RestController
 @RequestMapping("/review/scene/change/task")
 public class ReviewSceneChangeTaskController extends BaseController {

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 
-@Api("体系审查任务组成员")
+@Api(tags = "体系审查任务组成员")
 @RestController
 @RequestMapping("/review/Task/User")
 public class ReviewTaskUserRelationController extends BaseController {

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

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("标准")
+@Api(tags = "标准库")
 @RestController
 @RequestMapping("/standard")
 public class StandardController extends BaseController {
@@ -31,7 +31,7 @@ public class StandardController extends BaseController {
      * 分页查询
      * @return
      */
-    @ApiOperation("分页查询")
+    @ApiOperation("标准表分页查询")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/findStandardList")

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

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.List;
 
-@Api("体系审查任务")
+@Api(tags = "体系审查任务")
 @RestController
 @RequestMapping("/system/review/task")
 public class SystemReviewTaskController extends BaseController {
@@ -61,7 +61,7 @@ public class SystemReviewTaskController extends BaseController {
         return R.ok();
     }
 
-    @ApiOperation("提交审查问卷")
+    @ApiOperation("提交体系审查任务")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/submit")

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

@@ -9,10 +9,12 @@
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
         <result property="file" column="file" jdbcType="VARCHAR"/>
+        <result property="conformity" column="conformity" jdbcType="VARCHAR"/>
+        <result property="inconformity" column="inconformity" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="findList" parameterType="com.ruoyi.domain.Standard" resultMap="BaseResultMap">
-        SELECT id, name, standard_no, file
+        SELECT id, name, standard_no, file, conformity, inconformity
         FROM t_standard
         <where>
             <if test="params.name != null and params.name != ''">
@@ -25,7 +27,7 @@
     </select>
 
     <select id="findListById" resultMap="BaseResultMap">
-        SELECT id, name, standard_no, file
+        SELECT id, name, standard_no, file, conformity, inconformity
         FROM t_standard WHERE id = #{id}
     </select>