查询已审列表

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

@@ -2,6 +2,7 @@ package com.ruoyi.mapper;
 
 import com.ruoyi.domain.ReviewSceneChangeTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.request.ReviewSceneChangeTaskFindFinishRequest;
 import com.ruoyi.web.request.ReviewSceneChangeTaskFindPendingRequest;
 import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
 import org.springframework.stereotype.Repository;
@@ -33,7 +34,7 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang
      * @param userId
      * @return
      */
-    List<ReviewSceneChangeTaskResponse> findFinishListByUserId(@Param("userId") Long userId);
+    List<ReviewSceneChangeTaskResponse> findFinishListByUserId(@Param("userId") Long userId, @Param("request") ReviewSceneChangeTaskFindFinishRequest request);
 
     /**
      * 查询当前用户创建的任务

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

@@ -2,6 +2,7 @@ package com.ruoyi.service;
 
 import com.ruoyi.domain.ReviewSceneChangeTask;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.request.ReviewSceneChangeTaskFindFinishRequest;
 import com.ruoyi.web.request.ReviewSceneChangeTaskFindPendingRequest;
 import com.ruoyi.web.request.ReviewSceneChangeTaskPassRequest;
 import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
@@ -66,7 +67,7 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
      * @param userId
      * @return
      */
-    List<ReviewSceneChangeTaskResponse> findFinishListByUserId(Long userId);
+    List<ReviewSceneChangeTaskResponse> findFinishListByUserId(Long userId, ReviewSceneChangeTaskFindFinishRequest request);
 
     /**
      * 根据用户ID查询发布的任务列表

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

@@ -13,6 +13,7 @@ import com.ruoyi.service.ReviewSceneChangeTaskUserRelationService;
 import com.ruoyi.service.ReviewSceneService;
 import com.ruoyi.service.ReviewTaskInboxService;
 import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.web.request.ReviewSceneChangeTaskFindFinishRequest;
 import com.ruoyi.web.request.ReviewSceneChangeTaskFindPendingRequest;
 import com.ruoyi.web.request.ReviewSceneChangeTaskPassRequest;
 import com.ruoyi.web.response.ReviewSceneChangeTaskResponse;
@@ -218,8 +219,8 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
      * @return
      */
     @Override
-    public List<ReviewSceneChangeTaskResponse> findFinishListByUserId(Long userId) {
-        List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findFinishListByUserId(userId);
+    public List<ReviewSceneChangeTaskResponse> findFinishListByUserId(Long userId, ReviewSceneChangeTaskFindFinishRequest request) {
+        List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findFinishListByUserId(userId,request);
         return reviewSceneChangeTask;
     }
 

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

@@ -80,7 +80,7 @@ public class ReviewSceneChangeTaskController extends BaseController {
     @RequestMapping(method = RequestMethod.POST, value = "/findFinish")
     public TableDataInfo<ReviewSceneChangeTaskResponse> findFinish(@Validated @RequestBody ReviewSceneChangeTaskFindFinishRequest request) {
         startPage(request);
-        return getDataTable(reviewSceneChangeTaskService.findFinishListByUserId(getUserId()));
+        return getDataTable(reviewSceneChangeTaskService.findFinishListByUserId(getUserId(),request));
     }
 
     /**

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

@@ -2,7 +2,19 @@ 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
+@ApiModel(value = "ReviewSceneChangeTaskFindFinishRequest", description = "查询处理完成的任务")
+@Data
 public class ReviewSceneChangeTaskFindFinishRequest extends PageDomain {
+
+    @ApiModelProperty("评审类型")
+    private String operationSort;
+
+    @ApiModelProperty("条款分类[system(体系审查)、car(车型审查)]")
+    private String type;
+
+    @ApiModelProperty("关键词")
+    private String keyword;
 }

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

@@ -72,6 +72,16 @@
         SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct
         LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id
         WHERE sctu.user_id = #{userId} and sctu.decision IS NOT NULL
+        <if test="request.operationSort != null and request.operationSort != ''">
+            and sct.operation_sort = #{request.operationSort}
+        </if>
+        <if test="request.type != null and request.type != ''">
+            and sct.type = #{request.type}
+        </if>
+        <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
     </select>
 
     <select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">