Merge branch 'wangdingyi' into 'dev'

返回文件名称

See merge request !157

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

@@ -87,8 +87,8 @@ public class ReviewDetailsResult implements Serializable {
     private Long reviewEnterpriseArchiveId;
 
     @TableField(exist = false)
-    @ApiModelProperty("企业名称")
-    private String enterpriseName;
+    @ApiModelProperty("文件名称")
+    private String fileName;
 
 
 }

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

@@ -89,16 +89,6 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
         // 任务样品关系
         List<TaskSampleRelation> relations = taskSampleRelationMapper.selectByTaskId(taskMapper.findByCarReviewTaskId(carReviewTask.getId()),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
 
-        if (results.size() != 0 && results != null) {
-            for (ReviewDetailsResult reviewDetailsResult : results) {
-                if (reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() == null && relations.size() != 0 && relations != null) {
-                    TaskSampleRelation taskSampleRelation = relations.get(0);
-                    Sample sample = sampleManagementMapper.selectSampleManagementById(taskSampleRelation.getSampleId());
-                    reviewDetailsResult.setEnterpriseName(sample.getManufacturingEnterprise());
-                }
-            }
-        }
-
         // 绑定问卷与答案
         setDetailsResult(standardTree, results,carReviewTask);
 
@@ -186,7 +176,7 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
                     }
                     if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
                         ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
-                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                        reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());
                     }
                     details.setResult(reviewDetailsResult);
                 }

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

@@ -132,16 +132,6 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
         // 任务样品关系
         List<TaskSampleRelation> relations = taskSampleRelationMapper.selectByTaskId(taskMapper.findBySystemReviewTaskId(systemReviewTask.getId()),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
 
-        if (results.size() != 0 && results != null) {
-            for (ReviewDetailsResult reviewDetailsResult : results) {
-                if (reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() == null && relations.size() != 0 && relations != null) {
-                    TaskSampleRelation taskSampleRelation = relations.get(0);
-                    Sample sample = sampleManagementMapper.selectSampleManagementById(taskSampleRelation.getSampleId());
-                    reviewDetailsResult.setEnterpriseName(sample.getManufacturingEnterprise());
-                }
-            }
-        }
-
         // 绑定问卷与答案
         setDetailsResult(standardTree, results, systemReviewTask);
 
@@ -185,7 +175,7 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
                     }
                     if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
                         ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
-                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                        reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());
                     }
                     details.setResult(reviewDetailsResult);
                 }