From 8ddaccbff19beaaf0192a0c39f015cdff154dac3 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Thu, 17 Nov 2022 18:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E8=90=A5=E5=92=8C?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=87=87=E8=B4=ADbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/purechase/SupCertSetController.java | 4 +--- .../controller/purechase/SupCompanyController.java | 13 ++++++++++++- .../controller/purechase/SupProductController.java | 10 +++++++--- .../mybatis/mapper/purchase/PurApplyDetailDao.xml | 1 + .../mybatis/mapper/purchase/PurPlanDetailDao.xml | 1 + .../mybatis/mapper/purchase/SupCertDao.xml | 3 ++- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java index c4bb460..85262f9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java @@ -89,9 +89,7 @@ public class SupCertSetController { filterCertSetsRequest.setType(supCertSetEntity.getType()); filterCertSetsRequest.setName(supCertSetEntity.getName()); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); - if(supCertEntityList.size()>0){ - return ResultVOUtils.error(999,"该证书名称已存在！"); - } + boolean b = supCertSetService.updateCertSet(supCertSetEntity); return ResultVOUtils.success("修改成功"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java index 2b01e28..edf0b02 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java @@ -107,12 +107,23 @@ public class SupCompanyController { public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) { if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) { + + + //判断是不是存在草稿 + List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); + for(SupCertEntity obj:supCertEntityList){ + if(obj.getAuditStatus()==0){ + return ResultVOUtils.error(999,"证书中存在草稿不允许提交！"); + } + } + + //提交审核 FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); filterCertSetsRequest.setNeed(1); List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); - List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); + //验证 ListIterator iterable = supCertSetEntities.listIterator(); while (iterable.hasNext()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java index 0959b52..7085423 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java @@ -118,7 +118,9 @@ public class SupProductController { ListIterator iterable = supCertSetEntities.listIterator(); while (iterable.hasNext()) { SupCertSetEntity supCertSetEntity = iterable.next(); - if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 + if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部") + || StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部") + || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx())) @@ -222,12 +224,14 @@ public class SupProductController { while (iterable.hasNext()) { SupCertSetEntity supCertSetEntity = iterable.next(); - if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 + if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部") + || StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部") + || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx())) || (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb())) - || supCertSetEntity.getFlbm()!=null && (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode()))) + || StrUtil.isNotEmpty(supCertSetEntity.getFlbm()) &&(supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode()))) ) { for (SupCertEntity supCertEntity : supCertEntityList) { if (supCertEntity.getName().equals(supCertSetEntity.getName())) { diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index 7b4b251..fca23c4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -32,6 +32,7 @@ AND orderIdFk = #{orderIdFk} + AND basic_products.diType=1 AND productId = #{productId} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml index e09de22..7d4b0b1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml @@ -32,6 +32,7 @@ AND orderIdFk = #{orderIdFk} + AND basic_products.diType=1 AND productId = #{productId} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml index abb9254..360d38d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -19,7 +19,7 @@ and `type` = #{type} - + and auditStatus = #{auditStatus} @@ -29,6 +29,7 @@ and (auditStatus = 2 or auditStatus=3 or auditStatus=5 or auditStatus=6) + ORDER BY id DESC