From 578936a7aad1ec859c5cd7eec61b7bf3d7ba7d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 27 Mar 2023 11:28:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=B4=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/purchase/SupManufacturerController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index d14f0363..5915aa33 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -215,8 +215,8 @@ public class SupManufacturerController { if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { //判断是否上级供应商是否审核通过 SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId()); - if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN - || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { + if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_REJECT + || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_REJECT) { return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！"); } From bca51c75734479d8cb16f0911977881f98c29c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 27 Mar 2023 15:14:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E7=BA=A7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/purchase/SupCompanyEntity.java | 9 +++++++++ .../glxp/api/entity/purchase/SupManufacturerEntity.java | 5 +++++ .../glxp/api/req/purchase/FilterSupCompanyRequest.java | 1 + .../api/req/purchase/FilterSupManufacturerRequest.java | 1 + .../resources/mybatis/mapper/purchase/SupCompanyDao.xml | 8 +++++++- .../mybatis/mapper/purchase/SupManufacturerDao.xml | 7 ++++++- 6 files changed, 29 insertions(+), 2 deletions(-) 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