Merge branch 'dev' into wangfei

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

@@ -24,6 +24,10 @@ import lombok.Data;
 public class Sample extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
+    // 整车样品
+    public static final String SAMPLE_FLAG_CAR = "0";
+    // 零部件样品
+    public static final String SAMPLE_FLAG_PART = "1";
 
     /** 主键 */
     @ApiModelProperty("主键")
@@ -89,4 +93,8 @@ public class Sample extends BaseEntity
     /**  样品照片 */
     @ApiModelProperty("样品照片")
     private String samplePhotos;
+
+    /** 车企名称 */
+    @ApiModelProperty("车企名称")
+    private String carCompanyName;
 }

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

@@ -21,10 +21,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="deleted"    column="deleted"    />
         <result property="enterpriseId"    column="enterprise_id"    />
-        <result property="enterpriseName"    column="enterprise_name"    />
         <result property="remark"    column="remark"    />
         <result property="trademark"    column="trademark"    />
         <result property="samplePhotos"    column="sample_photos"    />
+        <result property="carCompanyName"    column="car_company_name"    />
     </resultMap>
 
     <sql id="selectTSampleManagementVo">
@@ -47,9 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.remark,
                sm.trademark,
                sm.sample_photos,
-               ae.enterprise_name
+               sm.car_company_namem
         from t_sample sm
-        left join t_automobile_enterprise ae on ae.id = sm.enterprise_id
     </sql>
 
     <select id="selectSampleManagementList" parameterType="com.ruoyi.domain.Sample" resultMap="SampleManagementResult">