From a0daf79e3dacda9af37d408d5cca9d11260b65d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 21 Apr 2023 16:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/SupCertController.java | 172 +++++++++++------- 1 file changed, 103 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 80730ada..4d484458 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -84,6 +84,63 @@ public class SupCertController { } + + + private BaseResponse insertCompanyCert(String customerId, PostSelCertRequest request) { + if (CollUtil.isEmpty(request.getSupCertSetEntities())) { + return ResultVOUtils.error(500, "请选入资质证书！"); + } + if (request.getCertType() == null) { + return ResultVOUtils.error(500, "参数错误！"); + } + + int certType = request.getCertType(); + String productIdFk = request.getProductIdFk(); + String manufacturerIdFk = request.getManufacturerIdFk(); + + String errMsg = ""; + ArrayList list = new ArrayList<>(); + int i = request.getSupCertSetEntities().size(); + for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) { + i--; + FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); + supCertRequest.setName(supCertSetEntity.getName()); + supCertRequest.setCustomerId(customerId); + supCertRequest.setManufacturerIdFk(manufacturerIdFk); + if (productIdFk != null) { + supCertRequest.setProductIdFk(productIdFk); + supCertRequest.setType(3); + } else { + supCertRequest.setType(2); + } + + List supCertEntities = supCertService.selectCompanyCert(supCertRequest); + if (!supCertEntities.isEmpty()) { + list.add(supCertEntities.get(0).getName()); + if (i == 0) { + errMsg = list.stream().map(s -> "," + s).collect(Collectors.joining()); + return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); + } + } + } + + for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) { + SupCertEntity supCertEntity = new SupCertEntity(); + supCertEntity.setName(supCertSetEntity.getName()); + supCertEntity.setManufacturerIdFk(manufacturerIdFk); + supCertEntity.setProductIdFk(productIdFk); + supCertEntity.setCustomerId(customerId); + supCertEntity.setType(certType); + supCertEntity.setCreateTime(new Date()); + supCertEntity.setStatus(0); + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.insertCompanyCert(supCertEntity); + } + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("") @PostMapping("/sup/info/selectAllCert") @Log(title = "资质证书", businessType = BusinessType.INSERT) @@ -100,76 +157,11 @@ public class SupCertController { if (postSelCertRequest.getCertType() == null) { return ResultVOUtils.error(500, "参数错误！"); } - if (postSelCertRequest.getManufacturerIdFk() == null) { - String errMsg = ""; - ArrayList list = new ArrayList<>(); - int i = postSelCertRequest.getSupCertSetEntities().size(); - for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { - i--; - FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); - supCertRequest.setName(supCertSetEntity.getName()); - supCertRequest.setCustomerId(customerId); - List supCertEntities = supCertService.selectCompanyCert(supCertRequest); - if (supCertEntities.size() != 0) { - list.add(supCertEntities.get(0).getName()); - if (supCertEntities.size() != 0 && i == 0) { - for (String s : list) { - errMsg = errMsg + "," + s; - } - return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); - } - } - } - }else{ - if(postSelCertRequest.getProductIdFk()==null) { - String errMsg = ""; - ArrayList list = new ArrayList<>(); - int i = postSelCertRequest.getSupCertSetEntities().size(); - for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { - i--; - FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); - supCertRequest.setName(supCertSetEntity.getName()); - supCertRequest.setCustomerId(customerId); - supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); - supCertRequest.setType(2); - List supCertEntities = supCertService.selectCompanyCert(supCertRequest); - if (supCertEntities.size() != 0) { - list.add(supCertEntities.get(0).getName()); - if (supCertEntities.size() != 0 && i == 0) { - for (String s : list) { - errMsg = errMsg + "," + s; - } - return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); - } - } - } - }else{ - String errMsg = ""; - ArrayList list = new ArrayList<>(); - int i = postSelCertRequest.getSupCertSetEntities().size(); - for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { - i--; - FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); - supCertRequest.setName(supCertSetEntity.getName()); - supCertRequest.setCustomerId(customerId); - supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); - supCertRequest.setProductIdFk(postSelCertRequest.getProductIdFk()); - supCertRequest.setType(3); - List supCertEntities = supCertService.selectCompanyCert(supCertRequest); - if (supCertEntities.size() != 0) { - list.add(supCertEntities.get(0).getName()); - if (supCertEntities.size() != 0 && i == 0) { - for (String s : list) { - errMsg = errMsg + "," + s; - } - return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); - } - } - } - } - } - + String errMsg=checkCert(postSelCertRequest,customerId); + if(StrUtil.isNotEmpty(errMsg)){ + return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); + } for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { SupCertEntity supCertEntity = new SupCertEntity(); supCertEntity.setName(supCertSetEntity.getName()); @@ -187,6 +179,48 @@ public class SupCertController { } + + public String checkCert(PostSelCertRequest postSelCertRequest,String customerId){ + + String errMsg = ""; + ArrayList list = new ArrayList<>(); + int i = postSelCertRequest.getSupCertSetEntities().size(); + for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { + i--; + FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); + supCertRequest.setName(supCertSetEntity.getName()); + supCertRequest.setCustomerId(customerId); + if(StrUtil.isEmpty(postSelCertRequest.getProductIdFk()) && StrUtil.isNotEmpty(postSelCertRequest.getManufacturerIdFk())) { + supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); + supCertRequest.setType(2); + } + if(StrUtil.isNotEmpty(postSelCertRequest.getProductIdFk()) && StrUtil.isNotEmpty(postSelCertRequest.getManufacturerIdFk())) { + supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); + supCertRequest.setProductIdFk(postSelCertRequest.getProductIdFk()); + supCertRequest.setType(3); + } + List supCertEntities = supCertService.selectCompanyCert(supCertRequest); + if (supCertEntities.size() != 0) { + list.add(supCertEntities.get(0).getName()); + if (supCertEntities.size() != 0 && i == 0) { + for (String s : list) { + errMsg = errMsg + "," + s; + } + return errMsg; + } + }else{ + if(i == 0 && list.size()>0){ + for (String s : list) { + errMsg = errMsg + "," + s; + } + return errMsg; + } + } + } + return errMsg; + } + + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanyCert") public BaseResponse getCompanyCert(FilterSupCertRequest filterSupCertRequest) {