diff --git a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java b/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java index 5c2f52c..fcbcb9f 100644 --- a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java +++ b/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; } diff --git a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java b/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java index 753abff..2a18d79 100644 --- a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java +++ b/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; } diff --git a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java index 51ee610..b62a737 100644 --- a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java +++ b/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; } diff --git a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java index 4c00fa6..8b062a3 100644 --- a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java +++ b/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; + } diff --git a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml index 0790f0e..ed03a5c 100644 --- a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml @@ -16,6 +16,7 @@ + @@ -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 diff --git a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml index a480ce3..7daf699 100644 --- a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml @@ -19,6 +19,7 @@ + @@ -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