diff --git a/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java index 021959cf..1b787d26 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java @@ -306,4 +306,13 @@ public class SupCompanyEntity { private String roleId; + @TableField(exist = false) + private String failCout; + @TableField(exist = false) + private String passCout; + + + + + } diff --git a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java index b1fa23a7..f90f9eb5 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java @@ -195,5 +195,10 @@ public class SupManufacturerEntity{ @TableField(exist = false) private String supName; + @TableField(exist = false) + private String failCout; + @TableField(exist = false) + private String passCout; + } diff --git a/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java index 82ebcb91..4200295f 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java @@ -16,4 +16,5 @@ public class FilterSupCompanyRequest extends ListPageRequest { private String unitIdFk; private String lastUpdateTime; private List auditStatusList; + private Integer manufacturerStatus; } diff --git a/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java index 5d3cbc7a..ce807ccf 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java @@ -16,4 +16,5 @@ public class FilterSupManufacturerRequest extends ListPageRequest { private String manufacturerId; private Integer type; private String lastUpdateTime; + private Integer productStatus; } diff --git a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index b20dd41d..b99edadb 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -14,7 +14,13 @@ - SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer + SELECT sup_manufacturer.* ,sup_company.companyName as supName + + ,(SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as failCout, + (SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4) AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as passCout + + FROM sup_manufacturer inner join sup_company on sup_manufacturer.customerId = sup_company.customerId