Merge remote-tracking branch 'origin/master'

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, "所属配送企业资质未通过审核，暂时无法提交！");
             }
 

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;
+
+
+
+
+
 }

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;
+
 
 }

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<String> auditStatusList;
+    private Integer manufacturerStatus;
 }

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;
 }

src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml

@@ -14,7 +14,13 @@
 
     <select id="filterCompany" parameterType="com.glxp.api.req.purchase.FilterSupCompanyRequest"
             resultType="com.glxp.api.entity.purchase.SupCompanyEntity">
-        SELECT * FROM sup_company
+        SELECT
+               *
+        <if test="manufacturerStatus!=null">
+        ,(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
+        </if>
+        FROM sup_company
         <where>
             <if test="customerId != null and customerId != ''">
                 and parentIdFk = #{customerId}

src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml

@@ -19,7 +19,12 @@
 
     <select id="getCompany" parameterType="com.glxp.api.req.purchase.FilterSupManufacturerRequest"
             resultType="com.glxp.api.entity.purchase.SupManufacturerEntity">
-        SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer
+        SELECT sup_manufacturer.* ,sup_company.companyName as supName
+        <if test="productStatus!=null">
+            ,(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
+        </if>
+        FROM sup_manufacturer
         inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
         <where>
             <if test="id != null and id != '' and type==null">