diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index e2b38532..29ac9f1b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -74,8 +74,6 @@ public class SupCompanyController { AuthRoleAdminService authRoleAdminService; - - @AuthRuleAnnotation("") @GetMapping("/api/pur/getSupComapnys") public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) { 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 1b787d26..5abf15a3 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java @@ -10,7 +10,7 @@ import java.util.Date; /** *

- * + * *

* * @author 作者 @@ -310,9 +310,10 @@ public class SupCompanyEntity { private String failCout; @TableField(exist = false) private String passCout; - - - + @TableField(exist = false) + private String productFailCout; + @TableField(exist = false) + private String prouctPassCout; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1c096635..a3fb0cb7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: pro jmx: enabled: false diff --git a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index b99edadb..109e69d1 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -19,6 +19,8 @@ ,(SELECT count(*) FROM sup_manufacturer WHERE sup_company.customerId=sup_manufacturer.customerId AND sup_manufacturer.auditStatus!=1 AND sup_manufacturer.auditStatus!=0 AND sup_manufacturer.auditStatus!=4 ) as failCout, (SELECT count(*) FROM sup_manufacturer WHERE sup_company.customerId=sup_manufacturer.customerId AND (sup_manufacturer.auditStatus=1 OR sup_manufacturer.auditStatus=4) ) as passCout + ,(SELECT count(*) FROM sup_product WHERE sup_company.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 ) as productFailCout, + (SELECT count(*) FROM sup_product WHERE sup_company.customerId=sup_product.customerId AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4) ) as prouctPassCout FROM sup_company @@ -186,4 +188,4 @@ - \ No newline at end of file +