diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0191739..f4e180e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -92,12 +92,12 @@ interchange_code AS "interchangeCode", bo.id AS "orderId", order_code AS "orderCode", - certification_company AS "certificationCompany", + bi.certification_company AS "certificationCompany", certification_company_fex AS "certificationCompanyFex", certification_company_email AS "certificationCompanyEmail", reciever, reciever_phone AS "recieverPhone", - certification_company_address AS "certificationCompanyAddress", + bi.certification_company_address AS "certificationCompanyAddress", bo.customer_id AS "customerId", customer_no AS "customerNo", customer_name AS "customerName", diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 0191739..f4e180e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -92,12 +92,12 @@ interchange_code AS "interchangeCode", bo.id AS "orderId", order_code AS "orderCode", - certification_company AS "certificationCompany", + bi.certification_company AS "certificationCompany", certification_company_fex AS "certificationCompanyFex", certification_company_email AS "certificationCompanyEmail", reciever, reciever_phone AS "recieverPhone", - certification_company_address AS "certificationCompanyAddress", + bi.certification_company_address AS "certificationCompanyAddress", bo.customer_id AS "customerId", customer_no AS "customerNo", customer_name AS "customerName", diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 191c565..04913e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -93,4 +93,10 @@ @ExcelProperty(value = "备注",order = 10) private String remark; + @ApiModelProperty(value = "证书单位名称", dataType = "String") + private String certificationCompany; + + @ApiModelProperty(value = "证书单位地址", dataType = "String") + private String certificationCompanyAddress; + }