Merge branch 'wangdingyi' into 'dev'

创建任务&查询发布的任务&查询待办任务&查询已办任务

See merge request !82

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

@@ -35,12 +35,21 @@ public class Task {
     @TableField(exist = false)
     public static final String TASK_STATUS_FINISH = "FINISH";
 
+    /**
+     * 汽车信息安全一般要求
+     */
     @TableField(exist = false)
     public static final String SUB_TASK_GRFIS = "grfis";
 
+    /**
+     * 汽车信息安全技术要求
+     */
     @TableField(exist = false)
     public static final String SUB_TASK_TRFIS = "trfis";
 
+    /**
+     * 汽车信息安全管理体系要求
+     */
     @TableField(exist = false)
     public static final String SUB_TASK_SRAIF = "sraif";
 
@@ -57,25 +66,28 @@ public class Task {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long carReviewTaskId;
 
+    @ApiModelProperty("任务状态NEW（新建的）、PENDING（运行中的）、FINISH（已结束的）")
+    private String taskStatus;
+
+    @ApiModelProperty("任务运行状态[RUNNABLE（可运行的）、RUNNING（运行中的）]")
+    private String runStatus;
+
+    @ApiModelProperty("下一个节点 SUB_TASK_SRAIF（体系审查子任务）、SUB_TASK_TRFIS（车辆实验子任务）、SUB_TASK_GRFIS（车辆问卷子任务）")
+    private String nextNode;
+
     @ApiModelProperty("任务编号")
     private String taskNo;
 
     @ApiModelProperty("任务名称")
     private String taskName;
 
-    @ApiModelProperty("任务状态[NEW、PENDING、FINISH]")
-    private String taskStatus;
-
-    @ApiModelProperty("运行状态[RUNNABLE、RUNNING]")
-    public String runStatus;
-
-    @ApiModelProperty("下一个节点 SUB_TASK_SRAIF（体系审查子任务）、SUB_TASK_TRFIS（车辆实验子任务）、SUB_TASK_GRFIS（车辆问卷子任务）")
-    private String nextNode;
+    @ApiModelProperty("保密等级")
+    private String confidentialityLevel;
 
     @ApiModelProperty("产品名称")
     private String productName;
 
-    @ApiModelProperty("产品型号")
+    @ApiModelProperty(" 车辆型号（产品型号）")
     private String productModel;
 
     @ApiModelProperty("委托单位")
@@ -90,42 +102,14 @@ public class Task {
     @ApiModelProperty("委托单位邮政编码")
     private String entrustedUnitCode;
 
-    @ApiModelProperty("车辆类型")
-    private String carType;
-
-    @ApiModelProperty("车辆识别码")
-    private String carIdentificationCode;
-
-    @ApiModelProperty("保密等级")
-    private String confidentialityLevel;
-
-    @ApiModelProperty("样品名称")
-    private String sampleName;
-
-    @ApiModelProperty("生产企业id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long productionId;
-
-    @ApiModelProperty("生产企业")
-    private String productionEnterprise;
-
-    @ApiModelProperty("送样者")
-    private String sampleSender;
-
-    @ApiModelProperty("送样日期")
-    private Date sendDate;
-
-    @ApiModelProperty("样品数量")
-    private String sampleNumber;
-
-    @ApiModelProperty("生产日期")
-    private Date productionDate;
+    @ApiModelProperty("整车样品信息")
+    private String vehicleSampleInformation;
 
-    @ApiModelProperty("商标")
-    private String trademark;
+    @ApiModelProperty("零件样品信息")
+    private String partSampleInformation;
 
-    @ApiModelProperty("检验依据")
-    private String inspectionBasis;
+    @ApiModelProperty("任务发起人id")
+    private Long taskInitiatorId;
 
     @ApiModelProperty("任务发起人姓名")
     private String taskInitiator;
@@ -154,7 +138,7 @@ public class Task {
 
 
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    @ApiModelProperty("关联标准表id")
+    @ApiModelProperty("关联标准表id（检验依据）")
     private Long standardId;
 
 

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

+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 任务表
+ */
+@ApiModel
+@TableName(value ="t_task_sample_relation", autoResultMap = true)
+@Accessors(chain = true)
+@Data
+public class TaskSampleRelation {
+
+    /**
+     * 整车样品
+     */
+    @TableField(exist = false)
+    public static final String COMPLETE_VEHICLE_SAMPLE = "0";
+
+    /**
+     * 零部件样品
+     */
+    @TableField(exist = false)
+    public static final String PART_VEHICLE_SAMPLE = "1";
+
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @ApiModelProperty("任务id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long taskId;
+
+    @ApiModelProperty("样品id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long sampleId;
+
+    @ApiModelProperty("0：整车样品  1：零部件样品")
+    private String flag;
+}

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

@@ -2,7 +2,9 @@ package com.ruoyi.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.Sample;
+import com.ruoyi.domain.TaskSampleRelation;
 import com.ruoyi.web.request.SampleManagementRequest;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -57,4 +59,6 @@ public interface SampleManagementMapper extends BaseMapper<Sample> {
      * */
     public List<Sample> selectSampleList(SampleManagementRequest sampleManagementRequest);
 
+    List<Sample> findByIdList(@Param("relationList") List<TaskSampleRelation> relationList);
+
 }

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

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.Task;
 import com.ruoyi.web.request.TaskFindFinishRequest;
 import com.ruoyi.web.request.TaskFindPendingRequest;
+import com.ruoyi.web.request.TaskFindRequest;
 import com.ruoyi.web.request.TaskListRequest;
-import com.ruoyi.web.response.TaskFindPendingResponse;
+import com.ruoyi.web.response.TaskFindResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -16,10 +17,12 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List<Task> findList(TaskListRequest request);
 
-    List<TaskFindPendingResponse> findPending(TaskFindPendingRequest request);
+    List<TaskFindResponse> findPending(TaskFindPendingRequest request);
 
     List<Task> findFinish(TaskFindFinishRequest request);
 
+    List<TaskFindResponse> findByUserId(@Param("request") TaskFindRequest request,@Param("userId")Long userId);
+
     Long findByCarReviewTaskId(@Param("carReviewId") Long carReviewId);
 
     Long findBySystemReviewTaskId(@Param("systemReviewId") Long systemReviewId);

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

+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.TaskSampleRelation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TaskSampleRelationMapper extends BaseMapper<TaskSampleRelation> {
+
+    /**
+     * 根据任务id查询
+     * @param taskId
+     * @return
+     */
+    List<TaskSampleRelation> selectByTaskId(@Param("taskId") Long taskId,@Param("flag") String flag);
+}

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

+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.TaskSampleRelation;
+
+import java.util.List;
+
+public interface TaskSampleRelationService extends IService<TaskSampleRelation> {
+
+    List<TaskSampleRelation> selectByTaskId(Long taskId, String flag);
+}

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

@@ -3,8 +3,8 @@ package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.Task;
 import com.ruoyi.web.request.*;
-import com.ruoyi.web.response.TaskFindPendingResponse;
-import org.apache.ibatis.annotations.Param;
+import com.ruoyi.web.response.TaskFindResponse;
+import com.ruoyi.web.response.TaskGetInfoResponse;
 
 import java.util.List;
 
@@ -24,7 +24,7 @@ public interface TaskService extends IService<Task> {
      * @param request
      * @return
      */
-    List<TaskFindPendingResponse> findPending(TaskFindPendingRequest request);
+    List<TaskFindResponse> findPending(TaskFindPendingRequest request);
 
     /**
      * 查询完成的任务
@@ -38,4 +38,13 @@ public interface TaskService extends IService<Task> {
     void deleteTask(TaskDeleteRequest request);
 
     void startTask(TaskStartRequest request);
+
+    /**
+     * 用户发起的任务
+     * @param request
+     * @return
+     */
+    List<TaskFindResponse> findCreate(TaskFindRequest request,Long userId);
+
+    TaskGetInfoResponse getInfo(TaskGetInfoRequest request);
 }

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

+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.domain.TaskSampleRelation;
+import com.ruoyi.mapper.TaskSampleRelationMapper;
+import com.ruoyi.service.TaskSampleRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TaskSampleRelationServiceImpl extends ServiceImpl<TaskSampleRelationMapper, TaskSampleRelation> implements TaskSampleRelationService {
+
+    @Autowired
+    private TaskSampleRelationMapper taskSampleRelationMapper;
+
+    @Override
+    public List<TaskSampleRelation> selectByTaskId(Long taskId,String flag) {
+        return taskSampleRelationMapper.selectByTaskId(taskId,flag);
+    }
+}

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

 package com.ruoyi.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.SnowflakeUtil;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.*;
 import com.ruoyi.mapper.*;
 import com.ruoyi.service.*;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.request.*;
-import com.ruoyi.web.response.TaskFindPendingResponse;
-import org.checkerframework.checker.units.qual.A;
+import com.ruoyi.web.response.TaskFindResponse;
+import com.ruoyi.web.response.TaskGetInfoResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +60,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     @Autowired
     private TaskStateFacade taskStateFacade;
 
+    @Autowired
+    private TaskSampleRelationService taskSampleRelationService;
+
+    @Autowired
+    private SampleManagementMapper sampleManagementMapper;
+
 
     @Override
     public List<Task> findList(TaskListRequest request) {
@@ -89,6 +93,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         // 构建并保存任务信息
         // 总任务
         Task task = new Task();
+        task.setTaskInitiatorId(loginUser.getUserId());
         task.setTaskInitiator(initiator.getNickName());
         task.setTaskInitiatorDept(initiator.getDept().getDeptName());
         task.setTaskStatus(Task.TASK_STATUS_NEW);
@@ -99,8 +104,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setStandardNo(standard.getStandardNo());
         task.setFile(standard.getFile());
         BeanUtils.copyBeanProp(task, request);
-        AutomobileEnterprise automobileEnterprise = automobileEnterpriseMapper.selectAutomobileEnterpriseById(request.getProductionId());
-        task.setProductionEnterprise(automobileEnterprise.getEnterpriseName());
 
         if(request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
             // 保存车型审查问卷任务
@@ -120,14 +123,34 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
         taskUserRelationService.saveBatch(auditors);
 
+        // 保存关联的整车样品信息
+        List<TaskSampleRelation> relations = request.getSample();
+        if (relations.size() != 0 && relations != null) {
+            for (TaskSampleRelation sampleRelation : relations) {
+                sampleRelation.setTaskId(task.getId());
+            }
+
+            taskSampleRelationService.saveBatch(relations);
+        }
+
+        // 保存关联的零部件样品信息
+        List<TaskSampleRelation> partRelations = request.getPartSample();
+        if (relations.size() != 0 && relations != null) {
+            for (TaskSampleRelation sampleRelation : partRelations) {
+                sampleRelation.setTaskId(task.getId());
+            }
+
+            taskSampleRelationService.saveBatch(partRelations);
+        }
+
         taskStateFacade.doCreate(task, request.getTaskList());
 
     }
 
     @Override
-    public List<TaskFindPendingResponse> findPending(TaskFindPendingRequest request) {
-        List<TaskFindPendingResponse> responses = taskMapper.findPending(request);
-        for (TaskFindPendingResponse response : responses) {
+    public List<TaskFindResponse> findPending(TaskFindPendingRequest request) {
+        List<TaskFindResponse> responses = taskMapper.findPending(request);
+        for (TaskFindResponse response : responses) {
             if (response.getSystemReviewTaskId() != null) {
                 response.setSystemReview(reviewDetailsMapper.count(response.getSystemReviewTaskId(),SystemReviewTask.TYPE));
             }
@@ -170,6 +193,26 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             auditor.setTaskId(task.getId());
         }
         taskUserRelationService.updateBatchById(auditors);
+
+        // 保存关联的整车样品信息
+        List<TaskSampleRelation> relations = request.getSample();
+        if (relations.size() != 0 && relations != null) {
+            for (TaskSampleRelation sampleRelation : relations) {
+                sampleRelation.setTaskId(task.getId());
+            }
+
+            taskSampleRelationService.updateBatchById(relations);
+        }
+
+        // 保存关联的零部件样品信息
+        List<TaskSampleRelation> partRelations = request.getPartSample();
+        if (relations.size() != 0 && relations != null) {
+            for (TaskSampleRelation sampleRelation : partRelations) {
+                sampleRelation.setTaskId(task.getId());
+            }
+
+            taskSampleRelationService.updateBatchById(partRelations);
+        }
     }
 
     @Override
@@ -187,6 +230,46 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         taskStateFacade.doStart(task);
     }
 
+    @Override
+    public List<TaskFindResponse> findCreate(TaskFindRequest request,Long userId) {
+        List<TaskFindResponse> responses = taskMapper.findByUserId(request,userId);
+        for (TaskFindResponse response : responses) {
+            if (response.getSystemReviewTaskId() != null) {
+                response.setSystemReview(reviewDetailsMapper.count(response.getSystemReviewTaskId(),SystemReviewTask.TYPE));
+            }
+            if (response.getCarReviewTaskId() != null) {
+                response.setCarReview(reviewDetailsMapper.count(response.getCarReviewTaskId(),CarReviewTask.TYPE));
+            }
+        }
+        return responses;
+    }
+
+    @Override
+    public TaskGetInfoResponse getInfo(TaskGetInfoRequest request) {
+
+        TaskGetInfoResponse response = new TaskGetInfoResponse();
+        Task task = taskService.getById(request.getId());
+        BeanUtils.copyBeanProp(response, task);
+        // 小组成员
+        List<TaskUserRelation> relation = taskUserRelationService.selectQTeamMembers(request.getId());
+        response.setAuditors(relation);
+        // 整车样品信息
+        List<TaskSampleRelation> relationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
+        if (relationList.size() != 0 && relationList != null) {
+            List<Sample> completeVehicleSampleList = sampleManagementMapper.findByIdList(relationList);
+            response.setCompleteVehicleSample(completeVehicleSampleList);
+        }
+
+        // 零部件样品信息
+        List<TaskSampleRelation> partRelationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.PART_VEHICLE_SAMPLE);
+        if (partRelationList.size() != 0 && partRelationList != null) {
+            List<Sample> partVehicleSampleList = sampleManagementMapper.findByIdList(partRelationList);
+            response.setPartVehicleSample(partVehicleSampleList);
+        }
+
+        return response;
+    }
+
     public Long saveSystemReview(TaskCreateRequest request,SysUser initiator,Standard standard,TaskUserRelation leader) {
 
         // 构建并保存任务信息

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

@@ -53,6 +53,8 @@ public class TaskStateNew implements TaskState, InitializingBean {
         }
 
         task.setNextNode(nextNode);
+
+        taskService.updateById(task);
     }
 
     @Override

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

@@ -7,11 +7,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.Task;
+import com.ruoyi.domain.TaskSampleRelation;
 import com.ruoyi.domain.TaskUserRelation;
+import com.ruoyi.service.TaskSampleRelationService;
 import com.ruoyi.service.TaskService;
 import com.ruoyi.service.TaskUserRelationService;
 import com.ruoyi.web.request.*;
-import com.ruoyi.web.response.TaskFindPendingResponse;
+import com.ruoyi.web.response.TaskFindResponse;
 import com.ruoyi.web.response.TaskGetInfoResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +39,9 @@ public class TaskController extends BaseController {
     @Autowired
     private TaskUserRelationService taskUserRelationService;
 
+    @Autowired
+    private TaskSampleRelationService taskSampleRelationService;
+
     @ApiOperation("查询任务列表")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
@@ -62,20 +67,25 @@ public class TaskController extends BaseController {
     @RequestMapping(method = RequestMethod.POST, value = "/getInfo")
     public R<TaskGetInfoResponse> getInfo(@Validated @RequestBody TaskGetInfoRequest request) {
 
-        TaskGetInfoResponse response = new TaskGetInfoResponse();
-        Task task = taskService.getById(request.getId());
-        BeanUtils.copyBeanProp(response, task);
-        List<TaskUserRelation> relation = taskUserRelationService.selectQTeamMembers(request.getId());
-        response.setAuditors(relation);
-
+        TaskGetInfoResponse response = taskService.getInfo(request);
         return R.ok(response);
     }
 
+    @ApiOperation("用户发布的任务")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/findCreate")
+    public TableDataInfo<TaskFindResponse> findCreate(@Validated @RequestBody TaskFindRequest request) {
+
+        startPage(request);
+        return getDataTable(taskService.findCreate(request,getUserId()));
+    }
+
     @ApiOperation("查询处理中的任务")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/findPending")
-    public TableDataInfo<TaskFindPendingResponse> findPending(@Validated @RequestBody TaskFindPendingRequest request) {
+    public TableDataInfo<TaskFindResponse> findPending(@Validated @RequestBody TaskFindPendingRequest request) {
         startPage(request);
         return getDataTable(taskService.findPending(request));
     }

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.domain.TaskSampleRelation;
 import com.ruoyi.domain.TaskUserRelation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
@@ -18,16 +19,26 @@ public class TaskCreateRequest {
     @ApiModelProperty("小组成员")
     private List<TaskUserRelation> auditors;
 
+    /**
+     * 标准id
+     * 根据哪个标准新建的审查任务
+     */
+    @ApiModelProperty("标准id(检验依据)")
+    private Long standardId;
+
     @ApiModelProperty("任务编号")
     private String taskNo;
 
     @ApiModelProperty("任务名称")
     private String taskName;
 
+    @ApiModelProperty("保密等级")
+    private String confidentialityLevel;
+
     @ApiModelProperty("产品名称")
     private String productName;
 
-    @ApiModelProperty("产品型号")
+    @ApiModelProperty("车辆型号（产品型号）")
     private String productModel;
 
     @ApiModelProperty("委托单位")
@@ -42,46 +53,14 @@ public class TaskCreateRequest {
     @ApiModelProperty("委托单位邮政编码")
     private String entrustedUnitCode;
 
-    @ApiModelProperty("车辆类型")
-    private String carType;
-
-    @ApiModelProperty("车辆识别码")
-    private String carIdentificationCode;
-
-    @ApiModelProperty("保密等级")
-    private String confidentialityLevel;
-
-    @ApiModelProperty("样品名称")
-    private String sampleName;
-
-    @ApiModelProperty("生产企业id")
-    private Long productionId;
-
-    @ApiModelProperty("送样者")
-    private String sampleSender;
-
-    @ApiModelProperty("送样日期")
-    private Date sendDate;
-
-    @ApiModelProperty("样品数量")
-    private String sampleNumber;
-
-    @ApiModelProperty("生产日期")
-    private Date productionDate;
-
-    @ApiModelProperty("商标")
-    private String trademark;
+    @ApiModelProperty("整车样品信息")
+    private List<TaskSampleRelation> sample;
 
-    @ApiModelProperty("检验依据")
-    private String inspectionBasis;
+    @ApiModelProperty("零部件样品信息")
+    private List<TaskSampleRelation> partSample;
 
     @ApiModelProperty("选择的任务")
     List<String> taskList;
 
-    /**
-     * 标准id
-     * 根据哪个标准新建的审查任务
-     */
-    @ApiModelProperty("标准id(根据哪个标准新建的任务)")
-    private Long standardId;
+
 }

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

 package com.ruoyi.web.request;
 
+import com.ruoyi.domain.TaskSampleRelation;
 import com.ruoyi.domain.TaskUserRelation;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,22 +13,29 @@ import java.util.List;
 @Data
 public class TaskEditRequest {
 
-    @ApiModelProperty("ID")
-    private Long id;
-
     @ApiModelProperty("小组成员")
     private List<TaskUserRelation> auditors;
 
+    /**
+     * 标准id
+     * 根据哪个标准新建的审查任务
+     */
+    @ApiModelProperty("标准id(检验依据)")
+    private Long standardId;
+
     @ApiModelProperty("任务编号")
     private String taskNo;
 
     @ApiModelProperty("任务名称")
     private String taskName;
 
+    @ApiModelProperty("保密等级")
+    private String confidentialityLevel;
+
     @ApiModelProperty("产品名称")
     private String productName;
 
-    @ApiModelProperty("产品型号")
+    @ApiModelProperty("车辆型号（产品型号）")
     private String productModel;
 
     @ApiModelProperty("委托单位")
@@ -42,38 +50,11 @@ public class TaskEditRequest {
     @ApiModelProperty("委托单位邮政编码")
     private String entrustedUnitCode;
 
-    @ApiModelProperty("车辆类型")
-    private String carType;
-
-    @ApiModelProperty("车辆识别码")
-    private String carIdentificationCode;
-
-    @ApiModelProperty("保密等级")
-    private String confidentialityLevel;
-
-    @ApiModelProperty("样品名称")
-    private String sampleName;
-
-    @ApiModelProperty("生产企业")
-    private String productionEnterprise;
-
-    @ApiModelProperty("送样者")
-    private String sampleSender;
-
-    @ApiModelProperty("送样日期")
-    private Date sendDate;
-
-    @ApiModelProperty("样品数量")
-    private String sampleNumber;
-
-    @ApiModelProperty("生产日期")
-    private Date productionDate;
-
-    @ApiModelProperty("商标")
-    private String trademark;
+    @ApiModelProperty("整车样品信息")
+    private List<TaskSampleRelation> sample;
 
-    @ApiModelProperty("检验依据")
-    private String inspectionBasis;
+    @ApiModelProperty("零部件样品信息")
+    private List<TaskSampleRelation> partSample;
 
     @ApiModelProperty("选择的任务")
     List<String> taskList;

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

@@ -11,12 +11,18 @@ import java.util.Date;
 @Data
 public class TaskFindFinishRequest extends PageDomain {
 
-    @ApiModelProperty("任务编号或名称关键词")
-    private String taskNoOrName;
+    @ApiModelProperty("检验依据")
+    private Long standardId;
 
-    @ApiModelProperty("任务开始时间")
-    private Date taskBeginTime;
+    @ApiModelProperty("任务编号")
+    private String taskNo;
 
-    @ApiModelProperty("任务结束时间")
-    private Date taskEndTime;
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("车辆型号")
+    private String productModel;
+
+    @ApiModelProperty("检验项目")
+    private String inspectionItem;
 }

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

@@ -11,12 +11,18 @@ import java.util.Date;
 @Data
 public class TaskFindPendingRequest extends PageDomain {
 
-    @ApiModelProperty("任务编号或名称关键词")
-    private String taskNoOrName;
+    @ApiModelProperty("检验依据")
+    private Long standardId;
 
-    @ApiModelProperty("任务开始时间")
-    private Date taskBeginTime;
+    @ApiModelProperty("任务编号")
+    private String taskNo;
 
-    @ApiModelProperty("子任务状态")
-    private String subStatus;
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("车辆型号")
+    private String productModel;
+
+    @ApiModelProperty("检验项目")
+    private String inspectionItem;
 }

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

+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;
+
+import java.util.Date;
+
+@ApiModel(value = "TaskFindRequest", description = "用户创建的任务")
+@Data
+public class TaskFindRequest extends PageDomain {
+
+    @ApiModelProperty("检验依据")
+    private Long standardId;
+
+    @ApiModelProperty("任务编号")
+    private String taskNo;
+
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("车辆型号")
+    private String productModel;
+
+    @ApiModelProperty("检验项目")
+    private String inspectionItem;
+
+    @ApiModelProperty("任务状态")
+    private String taskStatus;
+}

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

+package com.ruoyi.web.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "SampleListResponse", description = "样品信息")
+@Data
+public class SampleListResponse {
+
+    @ApiModelProperty("主键")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @ApiModelProperty("关联车企的id")
+    private Long enterpriseId;
+
+    @ApiModelProperty("车辆识别码")
+    private String identificationCode;
+
+    @ApiModelProperty("样品编号")
+    private String sampleNumber;
+
+    @ApiModelProperty("样品名称")
+    private String sampleName;
+}

quality-review/src/main/java/com/ruoyi/web/response/TaskFindPendingResponse.java → quality-review/src/main/java/com/ruoyi/web/response/TaskFindResponse.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 @ApiModel(value = "TaskFindPendingResponse", description = "进行中的总任务")
 @Data
-public class TaskFindPendingResponse {
+public class TaskFindResponse {
 
     @ApiModelProperty("主键")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -29,9 +29,15 @@ public class TaskFindPendingResponse {
     @ApiModelProperty("任务名称")
     private String taskName;
 
+    @ApiModelProperty("车辆型号（产品型号）")
+    private String productModel;
+
     @ApiModelProperty("任务状态（NEW、PENDING、FINISH）")
     private String taskStatus;
 
+    @ApiModelProperty("任务运行状态[RUNNABLE（可运行的）、RUNNING（运行中的）]")
+    private String runStatus;
+
     @ApiModelProperty("下一个节点 SUB_TASK_SRAIF（体系审查子任务）、SUB_TASK_TRFIS（车辆实验子任务）、SUB_TASK_GRFIS（车辆问卷子任务）")
     private String nextNode;
 
@@ -54,7 +60,7 @@ public class TaskFindPendingResponse {
     @ApiModelProperty("体系问卷任务开始时间")
     private Date systemTaskBeginTime;
 
-    @ApiModelProperty("体系问卷任务开始时间")
+    @ApiModelProperty("体系问卷任务结束时间")
     private Date systemTaskEndTime;
 
     @ApiModelProperty("车型审查任务状态")
@@ -66,7 +72,7 @@ public class TaskFindPendingResponse {
     @ApiModelProperty("车辆问卷任务开始时间")
     private Date carTaskBeginTime;
 
-    @ApiModelProperty("车辆问卷任务开始时间")
+    @ApiModelProperty("车辆问卷任务结束时间")
     private Date carTaskEndTime;
 
     @ApiModelProperty("测试任务状态")

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

@@ -3,6 +3,8 @@ package com.ruoyi.web.response;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.domain.Sample;
+import com.ruoyi.domain.TaskSampleRelation;
 import com.ruoyi.domain.TaskUserRelation;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,19 +29,28 @@ public class TaskGetInfoResponse {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long carReviewTaskId;
 
+    @ApiModelProperty("任务状态NEW（新建的）、PENDING（运行中的）、FINISH（已结束的）")
+    private String taskStatus;
+
+    @ApiModelProperty("任务运行状态[RUNNABLE（可运行的）、RUNNING（运行中的）]")
+    private String runStatus;
+
+    @ApiModelProperty("下一个节点 SUB_TASK_SRAIF（体系审查子任务）、SUB_TASK_TRFIS（车辆实验子任务）、SUB_TASK_GRFIS（车辆问卷子任务）")
+    private String nextNode;
+
     @ApiModelProperty("任务编号")
     private String taskNo;
 
     @ApiModelProperty("任务名称")
     private String taskName;
 
-    @ApiModelProperty("任务状态（NEW、PENDING、FINISH）")
-    private String taskStatus;
+    @ApiModelProperty("保密等级")
+    private String confidentialityLevel;
 
     @ApiModelProperty("产品名称")
     private String productName;
 
-    @ApiModelProperty("产品型号")
+    @ApiModelProperty(" 车辆型号（产品型号）")
     private String productModel;
 
     @ApiModelProperty("委托单位")
@@ -54,42 +65,14 @@ public class TaskGetInfoResponse {
     @ApiModelProperty("委托单位邮政编码")
     private String entrustedUnitCode;
 
-    @ApiModelProperty("车辆类型")
-    private String carType;
+    @ApiModelProperty("整车样品信息")
+    private String vehicleSampleInformation;
 
-    @ApiModelProperty("车辆识别码")
-    private String carIdentificationCode;
+    @ApiModelProperty("零件样品信息")
+    private String partSampleInformation;
 
-    @ApiModelProperty("保密等级")
-    private String confidentialityLevel;
-
-    @ApiModelProperty("样品名称")
-    private String sampleName;
-
-    @ApiModelProperty("生产企业id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long productionId;
-
-    @ApiModelProperty("生产企业")
-    private String productionEnterprise;
-
-    @ApiModelProperty("送样者")
-    private String sampleSender;
-
-    @ApiModelProperty("送样日期")
-    private Date sendDate;
-
-    @ApiModelProperty("样品数量")
-    private String sampleNumber;
-
-    @ApiModelProperty("生产日期")
-    private Date productionDate;
-
-    @ApiModelProperty("商标")
-    private String trademark;
-
-    @ApiModelProperty("检验依据")
-    private String inspectionBasis;
+    @ApiModelProperty("任务发起人id")
+    private Long taskInitiatorId;
 
     @ApiModelProperty("任务发起人姓名")
     private String taskInitiator;
@@ -118,7 +101,7 @@ public class TaskGetInfoResponse {
 
 
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    @ApiModelProperty("关联标准表id")
+    @ApiModelProperty("关联标准表id（检验依据）")
     private Long standardId;
 
 
@@ -135,4 +118,10 @@ public class TaskGetInfoResponse {
 
     @ApiModelProperty("小组成员")
     private List<TaskUserRelation> auditors;
+
+    @ApiModelProperty("整车样品信息")
+    private List<Sample> completeVehicleSample;
+
+    @ApiModelProperty("零件样品信息")
+    private List<Sample> partVehicleSample;
 }

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

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.remark,
                sm.trademark,
                sm.sample_photos,
-               sm.car_company_namem
+               sm.car_company_name
         from t_sample sm
     </sql>
 
@@ -164,4 +164,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="flag != null and flag != ''"> and sm.flag = #{flag} </if>
         </where>
     </select>
+
+    <resultMap type="com.ruoyi.web.response.SampleListResponse" id="SampleListResponse">
+        <result property="id"    column="id"    />
+        <result property="identificationCode"    column="identification_code"    />
+        <result property="sampleNumber"    column="sample_number"    />
+        <result property="sampleName"    column="sample_name"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+    </resultMap>
+    <select id="findByIdList" resultMap="SampleListResponse">
+        select id,identification_code,sample_number,sample_name,enterprise_id from t_sample
+        WHERE id IN
+        <foreach collection="relationList" item="relation" open="(" separator="," close=")">
+            #{relation.sampleId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mapper.TaskSampleRelationMapper">
+
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.TaskSampleRelation">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="taskId" column="task_id" jdbcType="BIGINT"/>
+        <result property="sampleId" column="sample_id" jdbcType="BIGINT"/>
+        <result property="flag" column="flag" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        select id,task_id,sample_id,flag from t_task_sample_relation
+    </sql>
+    <select id="selectByTaskId" resultType="com.ruoyi.domain.TaskSampleRelation">
+        <include refid="Base_Column_List"/>
+        where
+        <if test="taskId != null and taskId != ''">
+            task_id = #{taskId}
+        </if>
+        <if test="flag != null and flag != ''">
+            and flag = #{flag}
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file