From 2c6e34c3752f7a28c6768f3f44ccbfaa17cc9f83 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Tue, 15 Nov 2022 16:02:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E5=85=A5=E8=B5=84?= =?UTF-8?q?=E8=B4=A8=E8=AF=81=E4=B9=A6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purechase/SupManufacturerController.java | 44 +++++++++---------- .../mybatis/mapper/purchase/SupCertSetDao.xml | 1 + 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java index dac8101..730a9e6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java @@ -108,30 +108,30 @@ public class SupManufacturerController { //验证证书是否齐全 FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER); - filterCertSetsRequest.setNeed(0); List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); List supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); + //判断存在有草稿的未提交的就不能通过 + for(SupCertEntity obj:supCertEntityList){ + if (obj.getAuditStatus() == 0.) { + return ResultVOUtils.error(999,"资质证书存在草稿不能提交！"); + } + } ListIterator iterable = supCertSetEntities.listIterator(); while (iterable.hasNext()) { SupCertSetEntity supCertSetEntity = iterable.next(); - if (supCertSetEntity.isNeed() - || - (!supCertSetEntity.isNeed() && - supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 + if (( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) || - (!supCertSetEntity.isNeed() && + ( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1 && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) || - (!supCertSetEntity.isNeed() - && supCertSetEntity.getForeign() != null + ( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1 && supManufacturerEntity.getCompanyType().equals("1")) || - (!supCertSetEntity.isNeed() - && supCertSetEntity.getForeign() != null + ( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 3 && supManufacturerEntity.getCompanyType().equals("1"))) { for (SupCertEntity supCertEntity : supCertEntityList) { @@ -190,30 +190,30 @@ public class SupManufacturerController { //验证证书是否齐全 FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER); - filterCertSetsRequest.setNeed(0); List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); List supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); + //判断存在有草稿的未提交的就不能通过 + for(SupCertEntity obj:supCertEntityList){ + if (obj.getAuditStatus() == 0.) { + return ResultVOUtils.error(999,"资质证书存在草稿不能提交！"); + } + } ListIterator iterable = supCertSetEntities.listIterator(); while (iterable.hasNext()) { SupCertSetEntity supCertSetEntity = iterable.next(); - if (supCertSetEntity.isNeed() - || - (!supCertSetEntity.isNeed() && - supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 - && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) + if (( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 + && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) || - (!supCertSetEntity.isNeed() && + ( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1 - && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) + && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) || - (!supCertSetEntity.isNeed() - && supCertSetEntity.getForeign() != null + ( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1 && supManufacturerEntity.getCompanyType().equals("1")) || - (!supCertSetEntity.isNeed() - && supCertSetEntity.getForeign() != null + ( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 3 && supManufacturerEntity.getCompanyType().equals("1"))) { for (SupCertEntity supCertEntity : supCertEntityList) { diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml index 0cc54f8..4c69151 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -16,6 +16,7 @@ and `need` = #{need} + AND `foreign` is not null ORDER BY id DESC