Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java

@@ -65,12 +65,16 @@ public class ManufacturerInfo extends BaseEntity {
      */
     @ApiModelProperty(value = "经营范围")
     private String businessScope;
-    /**
-     * 执行标准
-     */
+	/**
+	 * 审核状态
+	 */
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-    @ApiModelProperty(value = "执行标准")
+    @ApiModelProperty(value = "审核状态")
     private Integer approvalStatus;
-
+	/**
+	 * 执行标准
+	 */
+	@ApiModelProperty(value = "执行标准")
+	private String executiveStandards;
 
 }

src/main/java/org/energy/modules/spares/entity/SupplierInfo.java

@@ -66,10 +66,10 @@ public class SupplierInfo extends BaseEntity {
     @ApiModelProperty(value = "经营范围")
     private String businessScope;
     /**
-     * 执行标准
+     * 审核状态
      */
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-    @ApiModelProperty(value = "执行标准")
+    @ApiModelProperty(value = "审核状态")
     private Integer approvalStatus;
     /**
      * 付款条约
@@ -81,6 +81,11 @@ public class SupplierInfo extends BaseEntity {
      */
     @ApiModelProperty(value = "价格条款")
     private String priceTerms;
+	/**
+	 * 执行标准
+	 */
+	@ApiModelProperty(value = "执行标准")
+	private String executiveStandards;
 
 
 }

src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java

@@ -85,6 +85,14 @@ public class ManufacturerInfoExcel implements Serializable {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@ColumnWidth(20)
 	@ExcelProperty(value = "执行标准")
+	private String executiveStandards;
+
+	/**
+	 * 审核状态
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ColumnWidth(20)
+	@ExcelProperty(value = "审核状态")
 	private String approvalStatus;
 
 }

src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java

@@ -82,7 +82,7 @@ public class SupplierInfoExcel implements Serializable {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@ColumnWidth(20)
 	@ExcelProperty(value = "执行标准")
-	private String approvalStatus;
+	private String executiveStandards;
 	/**
 	 * 付款条约
 	 */
@@ -96,4 +96,12 @@ public class SupplierInfoExcel implements Serializable {
 	@ExcelProperty(value = "价格条款")
 	private String priceTerms;
 
+	/**
+	 * 审核状态
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ColumnWidth(20)
+	@ExcelProperty(value = "审核状态")
+	private String approvalStatus;
+
 }

src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml

@@ -16,6 +16,7 @@
         <result column="manufacturer_name" property="manufacturerName"/>
         <result column="registered_address" property="registeredAddress"/>
         <result column="production_address" property="productionAddress"/>
+        <result column="executive_standards" property="executiveStandards"/>
         <result column="contact_number" property="contactNumber"/>
         <result column="email" property="email"/>
         <result column="business_scope" property="businessScope"/>
@@ -36,7 +37,8 @@
         a.contact_number,
         a.email,
         a.business_scope,
-        a.approval_status
+        a.approval_status,
+        a.executive_standards
         from spt_manufacturer_info a
         where a.is_deleted = 0
         <if test="vo.creditCode != null and vo.creditCode != ''">

src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml

@@ -19,6 +19,7 @@
         <result column="contact_number" property="contactNumber"/>
         <result column="email" property="email"/>
         <result column="business_scope" property="businessScope"/>
+        <result column="executive_standards" property="executiveStandards"/>
         <result column="approval_status" property="approvalStatus"/>
         <result column="payment_terms" property="paymentTerms"/>
         <result column="price_terms" property="priceTerms"/>
@@ -39,7 +40,8 @@
             a.business_scope,
             a.approval_status,
             a.payment_terms,
-            a.price_terms
+            a.price_terms,
+            a.executive_standards
         from spt_supplier_info a
         where a.is_deleted = 0
         <if test="vo.creditCode != null and vo.creditCode != ''">