Merge branch 'songyuanshuo' into 'master'

1./getReviewerOpinion 添加注释 2./review/standard/list 章节排序

See merge request !3

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

@@ -66,6 +66,9 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang
 
     List<ReviewerListResponse> selectReviewerListByTaskId(@Param("id") Long id);
 
+    /*
+     * 查看评审人员评审意见
+     * */
     List<ReviewOpinionResponse> getReviewerOpinion(@Param("id") Long id);
 }
 

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

@@ -122,6 +122,9 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
      * */
     List<SysUser> getReviewList();
 
+    /*
+     * 查看评审人员评审意见
+     * */
     List<ReviewOpinionResponse> getReviewerOpinion(Long id);
 
 }

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

@@ -531,6 +531,9 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         return reviewerList;
     }
 
+    /*
+     * 查看评审人员评审意见
+     * */
     @Override
     public List<ReviewOpinionResponse> getReviewerOpinion(Long id) {
         List<ReviewOpinionResponse> list = reviewSceneChangeTaskMapper.getReviewerOpinion(id);

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

@@ -53,14 +53,18 @@
         <where>
             <if test="standardId != null"> and standard_id = #{standardId} </if>
             <if test="type != null and type != ''"> and `type` = #{type} </if>
-            <if test="chapter != null and chapter != ''"> and chapter like concat('%', #{chapter}, '%') </if>
+            <if test="chapter != null and chapter != ''"> and chapter =#{chapter} </if>
             <if test="text != null and text != ''"> and text like concat('%', #{text}, '%') </if>
             <if test="testMethod != null and testMethod != ''"> and test_method like concat('%', #{testMethod}, '%') </if>
             <if test="name != null and text != ''">and name like concat('%',#{name}, '%')</if>
             <if test="standardNo != null and standardNo != ''">and standard_no like concat('%',#{standardNo},'%')</if>
         </where>
+        /*ORDER BY
+            chapter*/
         ORDER BY
-            chapter
+        CAST(SUBSTRING_INDEX(chapter, '.', 1) AS UNSIGNED),
+        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(chapter, '.', 2), '.', -1) AS UNSIGNED),
+        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(chapter, '.', 3), '.', -1) AS UNSIGNED)
     </select>
 
     <select id="selectTestInspectionContent"