编辑任务

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

@@ -193,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

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;