创建任务根据车企id设置车企名称

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

@@ -89,6 +89,10 @@ public class Task {
     @ApiModelProperty("样品名称")
     private String sampleName;
 
+    @ApiModelProperty("生产企业id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long productionId;
+
     @ApiModelProperty("生产企业")
     private String productionEnterprise;
 

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

@@ -8,10 +8,7 @@ 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.CarReviewTaskMapper;
-import com.ruoyi.mapper.ReviewDetailsMapper;
-import com.ruoyi.mapper.SystemReviewTaskMapper;
-import com.ruoyi.mapper.TaskMapper;
+import com.ruoyi.mapper.*;
 import com.ruoyi.service.*;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.request.*;
@@ -58,6 +55,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     @Autowired
     private ReviewDetailsMapper reviewDetailsMapper;
 
+    @Autowired
+    private AutomobileEnterpriseMapper automobileEnterpriseMapper;
+
     @Override
     public List<Task> findList(TaskListRequest request) {
         return taskMapper.findList(request);
@@ -93,6 +93,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setName(standard.getName());
         task.setStandardNo(standard.getStandardNo());
         task.setFile(standard.getFile());
+        AutomobileEnterprise automobileEnterprise = automobileEnterpriseMapper.selectById(request.getProductionId());
+        task.setProductionEnterprise(automobileEnterprise.getEnterpriseName());
         BeanUtils.copyBeanProp(task, request);
 
         Long systemReviewTaskId = null;

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

 package com.ruoyi.web.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.domain.TaskUserRelation;
 import io.swagger.annotations.Api;
@@ -53,8 +54,8 @@ public class TaskCreateRequest {
     @ApiModelProperty("样品名称")
     private String sampleName;
 
-    @ApiModelProperty("生产企业")
-    private String productionEnterprise;
+    @ApiModelProperty("生产企业id")
+    private Long productionId;
 
     @ApiModelProperty("送样者")
     private String sampleSender;

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

@@ -66,6 +66,10 @@ public class TaskGetInfoResponse {
     @ApiModelProperty("样品名称")
     private String sampleName;
 
+    @ApiModelProperty("生产企业id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long productionId;
+
     @ApiModelProperty("生产企业")
     private String productionEnterprise;
 

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

@@ -21,6 +21,7 @@
         <result property="carIdentificationCode" column="car_identification_code" jdbcType="VARCHAR"/>
         <result property="confidentialityLevel" column="confidentiality_level" jdbcType="VARCHAR"/>
         <result property="sampleName" column="sample_name" jdbcType="VARCHAR"/>
+        <result property="productionId" column="production_id" jdbcType="BIGINT"/>
         <result property="productionEnterprise" column="production_enterprise" jdbcType="VARCHAR"/>
         <result property="sampleSender" column="sample_sender" jdbcType="VARCHAR"/>
         <result property="sendDate" column="send_date" jdbcType="TIMESTAMP"/>
@@ -65,7 +66,7 @@
                task_no,task_name,task_status,product_name,product_model,
                entrusted_unit,entrusted_unit_address,entrusted_unit_phone,
                entrusted_unit_code,car_type,car_identification_code,
-               confidentiality_level,sample_name,production_enterprise,
+               confidentiality_level,sample_name,production_id,production_enterprise,
                sample_sender,send_date,sample_number,production_date,
                trademark,inspection_basis,task_initiator,task_initiator_dept,
                task_begin_time,task_end_time,create_time,