Merge branch 'dev' into wangfei

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

 package com.ruoyi.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.domain.vo.SampleTaskVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -93,4 +95,6 @@ public class Sample extends BaseEntity
     /** 车企名称 */
     @ApiModelProperty("车企名称")
     private String carCompanyName;
+
+    private List<SampleTaskVo>  taskSampleRelation;
 }

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

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 标准
  * @TableName t_standard
@@ -45,4 +47,16 @@ public class Standard {
     @ApiModelProperty("文件路径")
     private String file;
 
+    @ApiModelProperty("标准分类")
+    private String standardType;
+
+    @ApiModelProperty("标准状态")
+    private String standardStatus;
+
+    @ApiModelProperty("发布日期")
+    private Date releaseDate;
+
+    @ApiModelProperty("实施日期")
+    private Date implementationDate;
+
 }

quality-review/src/main/java/com/ruoyi/domain/vo/SampleTaskVo.java

+package com.ruoyi.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@ApiModel( description = "样品任务联查字段")
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class SampleTaskVo {
+    private Long taskId;
+    private Long SampleId;
+    private String taskName;
+}

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface StandardMapper extends BaseMapper<Standard> {
 
     // 分页查询
-    List<Standard> findList(@Param("params") StandardListRequest request);
+    List<Standard> findList();
 
     // 根据id查询
     Standard findListById(@Param("id") Long Id);

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

@@ -2,6 +2,8 @@ package com.ruoyi.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.Task;
+import com.ruoyi.domain.TaskSampleRelation;
+import com.ruoyi.domain.TaskUserRelation;
 import com.ruoyi.web.request.TaskFindFinishRequest;
 import com.ruoyi.web.request.TaskFindPendingRequest;
 import com.ruoyi.web.request.TaskFindRequest;
@@ -21,6 +23,8 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List<Task> findFinish(TaskFindFinishRequest request);
 
+    List<Task> findUserFinish (@Param("request") TaskFindFinishRequest request,@Param("userId")Long userId);
+
     List<TaskFindResponse> findByUserId(@Param("request") TaskFindRequest request,@Param("userId")Long userId);
 
     Long findByCarReviewTaskId(@Param("carReviewId") Long carReviewId);

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

@@ -2,6 +2,7 @@ package com.ruoyi.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.TaskSampleRelation;
+import com.ruoyi.domain.vo.SampleTaskVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -16,4 +17,9 @@ public interface TaskSampleRelationMapper extends BaseMapper<TaskSampleRelation>
      * @return
      */
     List<TaskSampleRelation> selectByTaskId(@Param("taskId") Long taskId,@Param("flag") String flag);
+
+
+    /**
+     * 根据样品id查询*/
+    List<SampleTaskVo> selectTaskBysampleId(@Param("idList") List<Long> idList);
 }

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface StandardService extends IService<Standard> {
 
     // 分页查询
-    List<Standard> findList(StandardListRequest request);
+    List<Standard> findList();
 
     //根据id查询
     Standard findListById(Long id);

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

@@ -47,4 +47,11 @@ public interface TaskService extends IService<Task> {
     List<TaskFindResponse> findCreate(TaskFindRequest request,Long userId);
 
     TaskGetInfoResponse getInfo(TaskGetInfoRequest request);
+
+    /**
+     * 查询已办任务
+     * @param request
+     * @return
+     */
+    List<Task> findUserFinish(TaskFindFinishRequest request,Long userId);
 }

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

 package com.ruoyi.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,7 +8,9 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.Sample;
+import com.ruoyi.domain.vo.SampleTaskVo;
 import com.ruoyi.mapper.SampleManagementMapper;
+import com.ruoyi.mapper.TaskSampleRelationMapper;
 import com.ruoyi.service.SampleManagementService;
 import com.ruoyi.web.request.SampleManagementRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,9 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap
     @Autowired
     private SampleManagementMapper sampleManagementMapper;
 
+    @Autowired
+    private TaskSampleRelationMapper taskSampleRelationMapper;
+
     /**
      * 查询样品管理
      * 
@@ -48,7 +54,11 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap
     @Override
     public List<Sample> selectSampleManagementList(SampleManagementRequest sampleManagementRequest)
     {
-        return sampleManagementMapper.selectSampleManagementList(sampleManagementRequest);
+        List<Sample> list = sampleManagementMapper.selectSampleManagementList(sampleManagementRequest);
+        if(list.size()>0){
+            setSampleTask(list);
+        }
+        return list;
     }
 
     /**
@@ -106,4 +116,24 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap
     public List<Sample> selectSampleList(SampleManagementRequest sampleManagementRequest){
         return sampleManagementMapper.selectSampleList(sampleManagementRequest);
     }
+
+
+    /**
+     * 给样品的数据赋值任务集合*/
+    public void setSampleTask(List<Sample> sampleList){
+        List<Long> listId = new ArrayList<>();
+        for(Sample sample : sampleList){
+            listId.add(sample.getId());
+        }
+        List<SampleTaskVo> sampleTaskVoList = taskSampleRelationMapper.selectTaskBysampleId(listId);
+        for(Sample sample : sampleList){
+            List<SampleTaskVo> sampleTaskVos = new ArrayList<>();
+            for (SampleTaskVo sampleTaskVo : sampleTaskVoList){
+                if(sampleTaskVo.getSampleId().equals(sample.getId())){
+                    sampleTaskVos.add(sampleTaskVo);
+                }
+            }
+            sample.setTaskSampleRelation(sampleTaskVos);
+        }
+    }
 }

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

@@ -18,12 +18,12 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
 
     /**
      * 分页查询
-     * @param request
+     * @param
      * @return
      */
     @Override
-    public List<Standard> findList(StandardListRequest request) {
-        return standardMapper.findList(request);
+    public List<Standard> findList() {
+        return standardMapper.findList();
     }
 
     /**

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

@@ -97,6 +97,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setTaskInitiator(initiator.getNickName());
         task.setTaskInitiatorDept(initiator.getDept().getDeptName());
         task.setTaskStatus(Task.TASK_STATUS_NEW);
+        task.setRunStatus(Task.RUN_STATUS_RUNNABLE);
         task.setLeaderId(leader.getUserId());
         task.setLeader(leader.getName());
         task.setCreateTime(new Date());
@@ -135,7 +136,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
         // 保存关联的零部件样品信息
         List<TaskSampleRelation> partRelations = request.getPartSample();
-        if (relations.size() != 0 && relations != null) {
+        if (partRelations.size() != 0 && partRelations != null) {
             for (TaskSampleRelation sampleRelation : partRelations) {
                 sampleRelation.setTaskId(task.getId());
             }
@@ -189,29 +190,35 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         taskService.updateById(task);
 
         // 构建并保存该任务所关联的审核组信息
+        List<TaskUserRelation> list = taskUserRelationService.selectQTeamMembers(request.getId());
+        taskUserRelationService.removeBatchByIds(list);
         for(TaskUserRelation auditor : auditors) {
             auditor.setTaskId(task.getId());
         }
-        taskUserRelationService.updateBatchById(auditors);
+        taskUserRelationService.saveBatch(auditors);
 
         // 保存关联的整车样品信息
+        List<TaskSampleRelation> relationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
+        taskSampleRelationService.removeBatchByIds(relationList);
         List<TaskSampleRelation> relations = request.getSample();
         if (relations.size() != 0 && relations != null) {
             for (TaskSampleRelation sampleRelation : relations) {
                 sampleRelation.setTaskId(task.getId());
             }
 
-            taskSampleRelationService.updateBatchById(relations);
+            taskSampleRelationService.saveBatch(relations);
         }
 
         // 保存关联的零部件样品信息
+        List<TaskSampleRelation> partRelationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.PART_VEHICLE_SAMPLE);
+        taskSampleRelationService.removeBatchByIds(partRelationList);
         List<TaskSampleRelation> partRelations = request.getPartSample();
-        if (relations.size() != 0 && relations != null) {
-            for (TaskSampleRelation sampleRelation : partRelations) {
-                sampleRelation.setTaskId(task.getId());
+        if (partRelations.size() != 0 && partRelations != null) {
+            for (TaskSampleRelation partSampleRelation : partRelations) {
+                partSampleRelation.setTaskId(task.getId());
             }
 
-            taskSampleRelationService.updateBatchById(partRelations);
+            taskSampleRelationService.saveBatch(partRelations);
         }
     }
 
@@ -270,6 +277,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         return response;
     }
 
+    @Override
+    public List<Task> findUserFinish(TaskFindFinishRequest request,Long userId) {
+
+        return taskMapper.findUserFinish(request,userId);
+    }
+
     public Long saveSystemReview(TaskCreateRequest request,SysUser initiator,Standard standard,TaskUserRelation leader) {
 
         // 构建并保存任务信息

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

@@ -42,11 +42,12 @@ public class SampleManagementController extends BaseController
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/list")
-    public TableDataInfo list(@Validated @RequestBody  SampleManagementRequest request)
+    public TableDataInfo<Sample> list(@Validated @RequestBody  SampleManagementRequest request)
     {
-        startPage();
+        startPage(request);
         List<Sample> list = sampleManagementService.selectSampleManagementList(request);
         return getDataTable(list);
+
     }
 
     /**

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

@@ -31,12 +31,12 @@ 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")
     public TableDataInfo<Standard> findList(@Validated @RequestBody StandardListRequest request) {
         startPage(request);
-        return getDataTable(standardService.findList(request));
+        return getDataTable(standardService.findList());
     }
 }

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

@@ -90,7 +90,7 @@ public class TaskController extends BaseController {
         return getDataTable(taskService.findPending(request));
     }
 
-    @ApiOperation("查询完成的任务")
+    @ApiOperation("查询已归档任务")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/findFinish")
@@ -99,6 +99,15 @@ public class TaskController extends BaseController {
         return getDataTable(taskService.findFinish(request));
     }
 
+    @ApiOperation("查询已办任务")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/findUserFinish")
+    public TableDataInfo<Task> findUserFinish(@Validated @RequestBody TaskFindFinishRequest request) {
+        startPage(request);
+        return getDataTable(taskService.findUserFinish(request,getUserId()));
+    }
+
     @ApiOperation("编辑任务")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})

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

@@ -7,6 +7,7 @@ import com.ruoyi.domain.Sample;
 import com.ruoyi.domain.TestScenario;
 import com.ruoyi.service.ITestScenarioService;
 import com.ruoyi.web.request.TestScenarioRequest;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.skywalking.apm.toolkit.trace.Tag;
 import org.apache.skywalking.apm.toolkit.trace.Tags;
@@ -20,10 +21,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-
+@Api(tags = "测试场景")
 @RestController
 @RequestMapping("/system/scenario")
 public class TestScenarioController extends BaseController {
+
+
     @Autowired
     private ITestScenarioService testScenarioService;
 
@@ -34,8 +37,8 @@ public class TestScenarioController extends BaseController {
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/getList")
-    public TableDataInfo list(@Validated @RequestBody TestScenarioRequest testScenarioRequest){
-        startPage();
+    public TableDataInfo<TestScenario> list(@Validated @RequestBody TestScenarioRequest testScenarioRequest){
+        startPage(testScenarioRequest);
         List<TestScenario> list = testScenarioService.selectTestScenarioList(testScenarioRequest);
         return getDataTable(list);
     }

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

@@ -3,11 +3,10 @@ package com.ruoyi.web;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.domain.TestScenario;
 import com.ruoyi.domain.TestType;
 import com.ruoyi.service.ITestTypeService;
-import com.ruoyi.web.request.TestScenarioRequest;
 import com.ruoyi.web.request.TestTypeRequest;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.skywalking.apm.toolkit.trace.Tag;
 import org.apache.skywalking.apm.toolkit.trace.Tags;
@@ -21,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+@Api(tags = "测试类型")
 @RestController
 @RequestMapping("/system/type")
 public class TestTypeController extends BaseController {
@@ -28,22 +28,22 @@ public class TestTypeController extends BaseController {
     private ITestTypeService testTypeService;
 
     /**
-     * 测试场景分页
+     * 查询测试类型分页
      */
-    @ApiOperation("查询测试场景分页查询")
+    @ApiOperation("查询测试类型分页查询")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/getList")
-    public TableDataInfo list(@Validated @RequestBody TestTypeRequest testTypeRequest){
-        startPage();
+    public TableDataInfo<TestType> list(@Validated @RequestBody TestTypeRequest testTypeRequest){
+        startPage(testTypeRequest);
         List<TestType> list = testTypeService.selectTestTypeList(testTypeRequest);
         return getDataTable(list);
     }
 
     /**
-     * 测试场景列表不分页
+     * 查询测试类型列表不分页
      */
-    @ApiOperation("查询测试场景")
+    @ApiOperation("查询测试类型")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/getListAll")

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

@@ -8,16 +8,4 @@ import lombok.Data;
 @ApiModel(value = "StandardListRequest", description = "查询标准")
 @Data
 public class StandardListRequest extends PageDomain {
-
-    /**
-     * 标准名称
-     */
-    @ApiModelProperty("标准名称")
-    private String name;
-
-    /**
-     * 标准号
-     */
-    @ApiModelProperty("标准号")
-    private String standardNo;
 }

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

 package com.ruoyi.web.request;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.domain.TaskSampleRelation;
 import com.ruoyi.domain.TaskUserRelation;
 import io.swagger.annotations.ApiModel;
@@ -13,6 +16,10 @@ import java.util.List;
 @Data
 public class TaskEditRequest {
 
+    @ApiModelProperty("主键")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
     @ApiModelProperty("小组成员")
     private List<TaskUserRelation> auditors;
 

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

@@ -9,19 +9,15 @@
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
         <result property="file" column="file" jdbcType="VARCHAR"/>
+        <result property="standardType" column="standard_type" jdbcType="VARCHAR"/>
+        <result property="standardStatus" column="standard_status" jdbcType="VARCHAR"/>
+        <result property="releaseDate" column="release_date" jdbcType="TIMESTAMP"/>
+        <result property="implementationDate" column="implementation_date" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <select id="findList" parameterType="com.ruoyi.web.request.StandardListRequest" resultMap="BaseResultMap">
-        SELECT id, name, standard_no, file
+        SELECT id, name, standard_no, file,standard_type,standard_status,release_date,implementation_date
         FROM t_standard
-        <where>
-            <if test="params.name != null and params.name != ''">
-                and name like concat('%',#{params.name},'%')
-            </if>
-            <if test="params.standardNo != null and params.standardNo != ''">
-                and standard_no = #{params.standardNo}
-            </if>
-        </where>
     </select>
 
     <select id="findListById" resultMap="BaseResultMap">

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

@@ -82,7 +82,7 @@
     </select>
     <select id="findPending" parameterType="com.ruoyi.web.request.TaskFindPendingRequest" resultMap="ResponseMap">
         SELECT t.id, t.system_review_task_id, t.car_review_task_id,
-               t.task_no,t.task_name,t.task_status,t.name,
+               t.task_no,t.task_name,t.task_status,t.run_status,t.name,
                t.leader_id,t.leader,
                t.task_begin_time,
                t.product_model,
@@ -111,10 +111,10 @@
                 and t.product_model = #{productModel}
             </if>
             <if test="inspectionItem != null and inspectionItem != ''">
-                AND (
-                (inspectionItem = 'sraif' AND t.system_review_task_id IS NOT NULL)
+                AND(
+                (#{inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
                 OR
-                (inspectionItem = 'grfis' AND t.car_review_task_id IS NOT NULL)
+                (#{inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
                 )
             </if>
         </where>
@@ -122,7 +122,7 @@
     </select>
     <select id="findFinish" parameterType="com.ruoyi.web.request.TaskFindFinishRequest" resultType="com.ruoyi.domain.Task">
         SELECT t.id, t.system_review_task_id, t.car_review_task_id,
-        t.task_no,t.task_name,t.task_status,
+        t.task_no,t.task_name,t.task_status,t.name,
         t.product_model,
         t.leader_id,t.leader,
         t.task_begin_time,t.task_end_time
@@ -143,9 +143,9 @@
             </if>
             <if test="inspectionItem != null and inspectionItem != ''">
                 AND (
-                (inspectionItem = 'sraif' AND t.system_review_task_id IS NOT NULL)
+                (#{inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
                 OR
-                (inspectionItem = 'grfis' AND t.car_review_task_id IS NOT NULL)
+                (#{inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
                 )
             </if>
         </where>
@@ -193,9 +193,9 @@
             </if>
             <if test="request.inspectionItem != null and request.inspectionItem != ''">
                 AND (
-                (request.inspectionItem = 'sraif' AND t.system_review_task_id IS NOT NULL)
+                (#{request.inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
                 OR
-                (request.inspectionItem = 'grfis' AND t.car_review_task_id IS NOT NULL)
+                (#{request.inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
                 )
             </if>
             <if test="request.taskStatus != null and request.taskStatus != ''">
@@ -204,6 +204,39 @@
         </where>
         order by t.create_time desc
     </select>
+    <select id="findUserFinish" parameterType="com.ruoyi.web.request.TaskFindFinishRequest" resultType="com.ruoyi.domain.Task">
+        SELECT t.id, t.system_review_task_id, t.car_review_task_id,
+        t.task_no,t.task_name,t.task_status,t.name,
+        t.product_model,
+        t.leader_id,t.leader,
+        t.task_begin_time,t.task_end_time
+        FROM t_task t
+        <where>
+            t.id IN (
+            SELECT task_id FROM t_task_user_relation WHERE user_id = #{userId}
+            )
+            and t.task_status = 'FINISH'
+            <if test="request.standardId != null and request.standardId != ''">
+                and t.standard_id = #{standardId}
+            </if>
+            <if test="request.taskNo != null and request.taskNo != ''">
+                and t.task_no = #{taskNo}
+            </if>
+            <if test="request.taskName != null and request.taskName != ''">
+                and t.task_name like concat('%',#{taskName},'%')
+            </if>
+            <if test="request.productModel != null and request.productModel != ''">
+                and t.product_model = #{productModel}
+            </if>
+            <if test="request.inspectionItem != null and request.inspectionItem != ''">
+                AND (
+                (#{request.inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
+                OR
+                (#{request.inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
+                )
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

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

@@ -25,4 +25,17 @@
         </if>
     </select>
 
+    <select id="selectTaskBysampleId" resultType="com.ruoyi.domain.vo.SampleTaskVo">
+        SELECT
+            relation.sample_id,
+            relation.task_id,
+            task.NAME As taskName
+        FROM
+            t_task_sample_relation relation
+                LEFT JOIN t_task task ON task.id = relation.task_id
+        WHERE relation.sample_id IN
+        <foreach item="id" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -9,10 +9,11 @@
         <result property="userId" column="user_id" jdbcType="BIGINT"/>
         <result property="isLeader" column="is_leader" jdbcType="TINYINT"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        select task_id,user_id,is_leader,name from t_task_user_relation
+        select task_id,user_id,is_leader,name,dept_name from t_task_user_relation
     </sql>
 
     <select id="selectQTeamMembers" parameterType="Long" resultMap="BaseResultMap">