Merge branch 'gaoying' into 'dev'

Gaoying

See merge request !179

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

@@ -96,5 +96,9 @@ public class Sample extends BaseEntity
     @ApiModelProperty("车企名称")
     private String carCompanyName;
 
+    /** 车企id */
+    @ApiModelProperty("车企id")
+    private Long manufacturingEnterpriseId;
+
     private List<SampleTaskVo>  taskSampleRelation;
 }

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

@@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="numberOfSamples"    column="number_of_samples"    />
         <result property="deliveryDate"    column="delivery_date"    />
         <result property="manufactureDate"    column="manufacture_date"    />
-        <result property="manufacturingEnterprise"    column="manufacturing_enterprise"    />
         <result property="flag"    column="flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -25,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="trademark"    column="trademark"    />
         <result property="samplePhotos"    column="sample_photos"    />
         <result property="carCompanyName"    column="car_company_name"    />
+        <result property="manufacturingEnterpriseId"    column="manufacturing_enterprise_id"    />
     </resultMap>
 
     <sql id="selectTSampleManagementVo">
@@ -36,7 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.number_of_samples,
                sm.delivery_date,
                sm.manufacture_date,
-               sm.manufacturing_enterprise,
                sm.flag,
                sm.create_by,
                sm.create_time,
@@ -47,8 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.remark,
                sm.trademark,
                sm.sample_photos,
-               sm.car_company_name
+               sm.car_company_name,
+               sm.manufacturing_enterprise_id,
+               ta.enterprise_name as manufacturingEnterprise
         from t_sample sm
+             left join t_automobile_enterprise ta on ta.id = sm.manufacturing_enterprise_id
     </sql>
 
     <select id="selectSampleManagementList" parameterType="com.ruoyi.domain.Sample" resultMap="SampleManagementResult">
@@ -77,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="numberOfSamples != null">number_of_samples,</if>
             <if test="deliveryDate != null">delivery_date,</if>
             <if test="manufactureDate != null">manufacture_date,</if>
-            <if test="manufacturingEnterprise != null">manufacturing_enterprise,</if>
+            <if test="manufacturingEnterpriseId != null">manufacturing_enterprise_id,</if>
             <if test="flag != null">flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -97,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="numberOfSamples != null">#{numberOfSamples},</if>
             <if test="deliveryDate != null">#{deliveryDate},</if>
             <if test="manufactureDate != null">#{manufactureDate},</if>
-            <if test="manufacturingEnterprise != null">#{manufacturingEnterprise},</if>
+            <if test="manufacturingEnterpriseId != null">#{manufacturingEnterpriseId},</if>
             <if test="flag != null">#{flag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -121,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="numberOfSamples != null">number_of_samples = #{numberOfSamples},</if>
             <if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
             <if test="manufactureDate != null">manufacture_date = #{manufactureDate},</if>
-            <if test="manufacturingEnterprise != null">manufacturing_enterprise = #{manufacturingEnterprise},</if>
+            <if test="manufacturingEnterpriseId != null">manufacturing_enterprise_Id = #{manufacturingEnterpriseId},</if>
             <if test="flag != null">flag = #{flag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>