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/ReviewSceneChangeTask.java

@@ -74,6 +74,12 @@ public class ReviewSceneChangeTask {
     @ApiModelProperty("任务编号")
     private String taskNo;
 
+    @ApiModelProperty("检验标准id")
+    private String inspectStandardId;
+
+    @ApiModelProperty("检验标准名称")
+    private String inspectStandardName;
+
     /**
      * 章节
      */

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

@@ -12,7 +12,7 @@ public class ReviewSceneChangeTaskFindCreateRequest extends PageDomain {
     @ApiModelProperty("评审类型")
     private String operationSort;
 
-    @ApiModelProperty("条款分类[system(体系审查)、car(车型审查)]")
+    @ApiModelProperty("标准要求分类[system(体系审查)、car(车型审查)]")
     private String type;
 
     @ApiModelProperty("关键词")
@@ -20,4 +20,8 @@ public class ReviewSceneChangeTaskFindCreateRequest extends PageDomain {
 
     @ApiModelProperty("评审状态")
     private String taskStatus;
+
+    @ApiModelProperty("检验标准")
+    private Long inspectStandardId;
+
 }

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

@@ -17,4 +17,7 @@ public class ReviewSceneChangeTaskFindFinishRequest extends PageDomain {
 
     @ApiModelProperty("关键词")
     private String keyword;
+
+    @ApiModelProperty("检验标准")
+    private Long inspectStandardId;
 }

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

@@ -17,4 +17,7 @@ public class ReviewSceneChangeTaskFindPendingRequest extends PageDomain {
 
     @ApiModelProperty("关键词")
     private String keyword;
+
+    @ApiModelProperty("检验标准")
+    private Long inspectStandardId;
 }

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

@@ -22,6 +22,12 @@ public class ReviewSceneChangeTaskResponse {
     @ApiModelProperty("任务编号")
     private String taskNo;
 
+    @ApiModelProperty("检验标准id")
+    private String inspectStandardId;
+
+    @ApiModelProperty("检验标准名称")
+    private String inspectStandardName;
+
     /**
      * 章节
      */

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

@@ -51,7 +51,7 @@
                 and status = #{status}
             </if>
             <if test="identifyNumber != null and identifyNumber != ''">
-                and identify_number = #{identifyNumber}
+                and identify_number like concat('%',#{identifyNumber},'%')
             </if>
         </where>
     </select>
@@ -77,7 +77,7 @@
                 and status = #{status}
             </if>
             <if test="identifyNumber != null and identifyNumber != ''">
-                and identify_number = #{identifyNumber}
+                and identify_number like concat('%',#{identifyNumber},'%')
             </if>
         </where>
     </select>

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

@@ -22,6 +22,8 @@
             <result property="taskResult" column="task_result" jdbcType="VARCHAR"/>
             <result property="taskBeginTime" column="task_begin_time" jdbcType="TIMESTAMP"/>
             <result property="taskEndTime" column="task_end_time" jdbcType="TIMESTAMP"/>
+            <result property="inspectStandardId" column="inspect_standard_id" jdbcType="BIGINT"/>
+            <result property="inspectStandardName" column="inspect_standard_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="ResponseResultMap" type="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
@@ -43,6 +45,8 @@
         <result property="taskBeginTime" column="task_begin_time" jdbcType="TIMESTAMP"/>
         <result property="taskEndTime" column="task_end_time" jdbcType="TIMESTAMP"/>
         <result property="decision" column="decision" jdbcType="VARCHAR"/>
+        <result property="inspectStandardId" column="inspect_standard_id" jdbcType="BIGINT"/>
+        <result property="inspectStandardName" column="inspect_standard_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="findLastChangeByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
@@ -65,7 +69,9 @@
         <if test="request.keyword != null and request.keyword != ''">
             and (sct.old_text like concat('%',#{request.keyword},'%') || sct.new_text like concat('%',#{request.keyword},'%'))
         </if>
-        order by sct.task_begin_time desc
+        <if test="request.inspectStandardId != null and request.inspectStandardId != ''">
+            and inspect_standard_id = #{request.inspectStandardId}
+        </if>
     </select>
 
     <select id="findFinishListByUserId" resultType="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
@@ -81,7 +87,9 @@
         <if test="request.keyword != null and request.keyword != ''">
             and (sct.old_text like concat('%',#{request.keyword},'%') || sct.new_text like concat('%',#{request.keyword},'%'))
         </if>
-        order by sct.task_begin_time desc
+        <if test="request.inspectStandardId != null and request.inspectStandardId != ''">
+            and inspect_standard_id = #{request.inspectStandardId}
+        </if>
     </select>
 
     <select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
@@ -99,7 +107,9 @@
         <if test="request.taskStatus != null and request.taskStatus != ''">
             and task_status = #{request.taskStatus}
         </if>
-        order by task_begin_time desc
+        <if test="request.inspectStandardId != null and request.inspectStandardId != ''">
+            and inspect_standard_id = #{request.inspectStandardId}
+        </if>
     </select>
 
 </mapper>

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

@@ -102,13 +102,13 @@
                 and t.standard_id = #{standardId}
             </if>
             <if test="taskNo != null and taskNo != ''">
-                and t.task_no = #{taskNo}
+                and t.task_no like concat('%',#{taskNo},'%')
             </if>
             <if test="taskName != null and taskName != ''">
                 and t.task_name like concat('%',#{taskName},'%')
             </if>
             <if test="productModel != null and productModel != ''">
-                and t.product_model = #{productModel}
+                and t.product_model like concat('%',#{productModel},'%')
             </if>
             <if test="inspectionItem != null and inspectionItem != ''">
                 AND(
@@ -133,13 +133,13 @@
                 and t.standard_id = #{standardId}
             </if>
             <if test="taskNo != null and taskNo != ''">
-                and t.task_no = #{taskNo}
+                and t.task_no like concat('%',#{taskNo},'%')
             </if>
             <if test="taskName != null and taskName != ''">
                 and t.task_name like concat('%',#{taskName},'%')
             </if>
             <if test="productModel != null and productModel != ''">
-                and t.product_model = #{productModel}
+                and t.product_model like concat('%',#{productModel},'%')
             </if>
             <if test="inspectionItem != null and inspectionItem != ''">
                 AND (
@@ -183,13 +183,13 @@
                 and t.standard_id = #{request.standardId}
             </if>
             <if test="request.taskNo != null and request.taskNo != ''">
-                and t.task_no = #{request.taskNo}
+                and t.task_no like concat('%',#{request.taskNo},'%')
             </if>
             <if test="request.taskName != null and request.taskName != ''">
                 and t.task_name like concat('%',#{request.taskName},'%')
             </if>
             <if test="request.productModel != null and request.productModel != ''">
-                and t.product_model = #{request.productModel}
+                and t.product_model like concat('%',#{request.productModel},'%')
             </if>
             <if test="request.inspectionItem != null and request.inspectionItem != ''">
                 AND (
@@ -220,13 +220,13 @@
                 and t.standard_id = #{standardId}
             </if>
             <if test="request.taskNo != null and request.taskNo != ''">
-                and t.task_no = #{taskNo}
+                and t.task_no like concat('%',#{request.taskNo},'%')
             </if>
             <if test="request.taskName != null and request.taskName != ''">
-                and t.task_name like concat('%',#{taskName},'%')
+                and t.task_name like concat('%',#{request.taskName},'%')
             </if>
             <if test="request.productModel != null and request.productModel != ''">
-                and t.product_model = #{productModel}
+                and t.product_model like concat('%',#{request.productModel},'%')
             </if>
             <if test="request.inspectionItem != null and request.inspectionItem != ''">
                 AND (