Merge branch 'gaoying' into 'dev'

样品 车企删除 实时

See merge request !181

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

@@ -92,5 +92,8 @@ public class Sample extends BaseEntity
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long manufacturingEnterpriseId;
 
+    @ApiModelProperty("企业名称实时")
+    private String enterpriseName;
+
     private List<SampleTaskVo>  taskSampleRelation;
 }

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

@@ -45,8 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.trademark,
                sm.sample_photos,
                sm.manufacturing_enterprise_id,
-               sm.manufacturing_enterprise
+               sm.manufacturing_enterprise,
+               tae.enterprise_name as enterpriseName
         from t_sample sm
+        left join  t_automobile_enterprise tae on tae.id = sm.manufacturing_enterprise_id and tae.deleted = 0
     </sql>
 
     <select id="selectSampleManagementList" parameterType="com.ruoyi.domain.Sample" resultMap="SampleManagementResult">