Merge branch 'gaoying' into 'dev'

Gaoying

See merge request !180

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

@@ -37,11 +37,6 @@ public class Sample extends BaseEntity
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
-    /** 车企ID 与车企信息表的id关联 */
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    @ApiModelProperty("关联车企的id")
-    private Long enterpriseId;
-
     /** 车辆识别码 */
     @ApiModelProperty("车辆识别码")
     private String identificationCode;
@@ -92,12 +87,9 @@ public class Sample extends BaseEntity
     @ApiModelProperty("样品照片")
     private String samplePhotos;
 
-    /** 车企名称 */
-    @ApiModelProperty("车企名称")
-    private String carCompanyName;
-
     /** 车企id */
     @ApiModelProperty("车企id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long manufacturingEnterpriseId;
 
     private List<SampleTaskVo>  taskSampleRelation;

quality-review/src/main/java/com/ruoyi/web/response/SampleListResponse.java

@@ -15,7 +15,7 @@ public class SampleListResponse {
 
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty("关联车企的id")
-    private Long enterpriseId;
+    private Long manufacturingEnterpriseId;
 
     @ApiModelProperty("车辆识别码")
     private String identificationCode;

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

@@ -19,12 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="deleted"    column="deleted"    />
-        <result property="enterpriseId"    column="enterprise_id"    />
         <result property="remark"    column="remark"    />
         <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"    />
+        <result property="manufacturingEnterprise"    column="manufacturing_enterprise"    />
     </resultMap>
 
     <sql id="selectTSampleManagementVo">
@@ -42,15 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sm.update_by,
                sm.update_time,
                sm.deleted,
-               sm.enterprise_id,
                sm.remark,
                sm.trademark,
                sm.sample_photos,
-               sm.car_company_name,
                sm.manufacturing_enterprise_id,
-               ta.enterprise_name as manufacturingEnterprise
+               sm.manufacturing_enterprise
         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">
@@ -80,12 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryDate != null">delivery_date,</if>
             <if test="manufactureDate != null">manufacture_date,</if>
             <if test="manufacturingEnterpriseId != null">manufacturing_enterprise_id,</if>
+            <if test="manufacturingEnterprise != null">manufacturing_enterprise,</if>
             <if test="flag != null">flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="enterpriseId != null">enterprise_id,</if>
             <if test="remark != null">remark,</if>
             <if test="trademark != null">trademark,</if>
             <if test="samplePhotos != null">sample_photos,</if>
@@ -100,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryDate != null">#{deliveryDate},</if>
             <if test="manufactureDate != null">#{manufactureDate},</if>
             <if test="manufacturingEnterpriseId != null">#{manufacturingEnterpriseId},</if>
+            <if test="manufacturingEnterprise != null">#{manufacturingEnterprise},</if>
             <if test="flag != null">#{flag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -124,12 +121,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
             <if test="manufactureDate != null">manufacture_date = #{manufactureDate},</if>
             <if test="manufacturingEnterpriseId != null">manufacturing_enterprise_Id = #{manufacturingEnterpriseId},</if>
+            <if test="manufacturingEnterprise != null">manufacturing_enterprise = #{manufacturingEnterprise},</if>
             <if test="flag != null">flag = #{flag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="trademark != null">trademark = #{trademark},</if>
             <if test="samplePhotos != null">sample_photos = #{samplePhotos},</if>
@@ -172,10 +169,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="identificationCode"    column="identification_code"    />
         <result property="sampleNumber"    column="sample_number"    />
         <result property="sampleName"    column="sample_name"    />
-        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="manufacturingEnterpriseId"    column="manufacturing_enterprise_id"    />
     </resultMap>
     <select id="findByIdList" resultMap="SampleManagementResult">
-        select t.id,t.identification_code,t.sample_number,t.sample_name,t.enterprise_id,t.trademark,t.sample_photos,t.number_of_samples,t.delivery_date,t.sample_sender,t.manufacturing_enterprise,t.manufacture_date
+        select t.id,t.identification_code,t.sample_number,t.sample_name,t.manufacturing_enterprise_id,t.trademark,t.sample_photos,t.number_of_samples,t.delivery_date,t.sample_sender,t.manufacturing_enterprise,t.manufacture_date
         from t_sample t
         left join t_task_sample_relation ts on ts.sample_id = t.id and ts.task_id = #{id}
         WHERE t.id IN