Merge branch 'wangdingyi' into 'dev'

自动带入企业名称

See merge request !155

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

@@ -171,4 +171,8 @@ public class CarReviewTask implements Serializable {
     @ApiModelProperty("参与审查人数（人）")
     private Integer person;
 
+    @TableField(exist = false)
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
 }

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

@@ -175,4 +175,8 @@ public class SystemReviewTask {
     @ApiModelProperty("参与审查人数（人）")
     private Integer person;
 
+    @TableField(exist = false)
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
 }

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

@@ -108,6 +108,12 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
         // 查询场景变更任务便于提醒用户场景变动
         List<ReviewSceneChangeTask> lastChanges = reviewSceneChangeTaskService.findLastChangeByTaskId(carReviewTask.getId());
 
+        List<TaskSampleRelation> sampleRelations = taskSampleRelationMapper.selectByTaskId(taskMapper.findByCarReviewTaskId(carReviewTask.getId()),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
+        TaskSampleRelation taskSampleRelation = sampleRelations.get(0);
+        Sample sample = sampleManagementMapper.selectSampleManagementById(taskSampleRelation.getSampleId());
+
+        carReviewTask.setEnterpriseName(sample.getManufacturingEnterprise());
+
         // 构建返回结果
 
         CarReviewTaskViewResponse response = new CarReviewTaskViewResponse();

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

@@ -151,6 +151,13 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
         // 查询场景变更任务便于提醒用户场景变动
         List<ReviewSceneChangeTask> lastChanges = reviewSceneChangeTaskService.findLastChangeByTaskId(systemReviewTask.getId());
 
+
+        List<TaskSampleRelation> sampleRelations = taskSampleRelationMapper.selectByTaskId(taskMapper.findBySystemReviewTaskId(systemReviewTask.getId()),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
+        TaskSampleRelation taskSampleRelation = sampleRelations.get(0);
+        Sample sample = sampleManagementMapper.selectSampleManagementById(taskSampleRelation.getSampleId());
+
+        systemReviewTask.setEnterpriseName(sample.getManufacturingEnterprise());
+
         // 构建返回结果
         SystemReviewTaskViewResponse response = new SystemReviewTaskViewResponse();
         systemReviewTask.setImagesUrl("/vehicle-quality-review-oss/2024/03/04/qianzi1_20240304104011A001.jpg,/vehicle-quality-review-oss/2024/03/04/qianzi2_20240304104121A002.jpg");