审查标准添加字段&确认接口修改

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

@@ -82,4 +82,21 @@ public class ReviewStandard {
     @ApiModelProperty("文件路径")
     private String file;
 
+    @ApiModelProperty("审核是否通过（0未通过、1通过）")
+    @TableField(exist = false)
+    private Integer passed;
+
+
+    /**
+     * 符合
+     */
+    @ApiModelProperty("符合")
+    private String conformity;
+
+    /**
+     * 不符合
+     */
+    @ApiModelProperty("不符合")
+    private String inconformity;
+
 }

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

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

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

@@ -130,13 +130,18 @@ 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(0);
             List<ReviewKeyPoint> keyPointList = standard.getKeyPointList();
 
             for(ReviewKeyPoint keypoint : keyPointList) {
                 List<ReviewDetails> reviewDetailsList = keypoint.getReviewDetailsList();
 
                 for(ReviewDetails details : reviewDetailsList) {
-                    details.setResult(resultMap.get(details.getId()));
+                    ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
+                    if(reviewDetailsResult.getPassed() != 0) {
+                        standard.setPassed(reviewDetailsResult.getPassed());
+                    }
+                    details.setResult(reviewDetailsResult);
                 }
             }
         }

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

@@ -81,6 +81,7 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
 
             // 3. 将最终问卷归档到 standard 字段
             setDetailsResult(standardTree, results);
+
             systemReviewTask.setStandard(standardTree);
 
             // 4. 修改任务状态为 SIGNED 待签字
@@ -131,13 +132,18 @@ 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(0);
             List<ReviewKeyPoint> keyPointList = standard.getKeyPointList();
 
             for(ReviewKeyPoint keypoint : keyPointList) {
                 List<ReviewDetails> reviewDetailsList = keypoint.getReviewDetailsList();
 
                 for(ReviewDetails details : reviewDetailsList) {
-                    details.setResult(resultMap.get(details.getId()));
+                    ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
+                    if(reviewDetailsResult.getPassed() != 0) {
+                        standard.setPassed(reviewDetailsResult.getPassed());
+                    }
+                    details.setResult(reviewDetailsResult);
                 }
             }
         }

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

@@ -14,6 +14,8 @@
         <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"/>
 
         <collection property="keyPointList" ofType="com.ruoyi.domain.ReviewKeyPoint" select="com.ruoyi.mapper.ReviewKeyPointMapper.findAllByReviewStandardId" column="id">
             <result property="id" column="u_id" jdbcType="BIGINT"/>
@@ -23,11 +25,11 @@
     </resultMap>
 
     <select id="findTree" resultMap="StandardTreeResultMap">
-        SELECT id, chapter, text, standard_id, name, standard_no, file FROM t_review_standard;
+        SELECT id, chapter, text, standard_id, name, standard_no, file, conformity, inconformity FROM t_review_standard;
     </select>
 
     <select id="findListByStandardIdAndType" resultType="com.ruoyi.domain.ReviewStandard">
-        SELECT id, type, chapter, text, standard_id, name, standard_no, file FROM t_review_standard WHERE standard_id = #{standardId} AND type = #{type};
+        SELECT id, type, chapter, text, standard_id, name, standard_no, file, conformity, inconformity FROM t_review_standard WHERE standard_id = #{standardId} AND type = #{type};
     </select>
 
 

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

@@ -9,12 +9,10 @@
         <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.web.request.StandardListRequest" resultMap="BaseResultMap">
-        SELECT id, name, standard_no, file, conformity, inconformity
+        SELECT id, name, standard_no, file
         FROM t_standard
         <where>
             <if test="params.name != null and params.name != ''">
@@ -27,7 +25,7 @@
     </select>
 
     <select id="findListById" resultMap="BaseResultMap">
-        SELECT id, name, standard_no, file, conformity, inconformity
+        SELECT id, name, standard_no, file
         FROM t_standard WHERE id = #{id}
     </select>