From 99506e1f400e691127782bbf8878ee44c0d8d350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Fri, 4 Aug 2023 18:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E8=B5=84=E8=B4=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E--=E6=96=B0=E5=A2=9E=E9=85=8D=E9=80=81=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E8=B5=84=E8=B4=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/SupProductController.java | 47 ++++++++++--------- .../glxp/api/dao/purchase/SupProductDao.java | 2 +- .../service/purchase/SupProductService.java | 2 +- .../purchase/impl/SupProductServiceImpl.java | 5 +- .../mybatis/mapper/purchase/SupProductDao.xml | 13 ++++- 5 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 7ed9805c..c3be3e50 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -140,6 +140,9 @@ public class SupProductController { return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); } } + int i = supProductService.findProduct(supProductEntity); + System.out.println(i); + if (i == 0) { supProductEntity.setCreateTime(new Date()); supProductEntity.setUpdateTime(new Date()); supProductEntity.setId(IdUtil.getSnowflakeNextId()); @@ -148,6 +151,8 @@ public class SupProductController { return ResultVOUtils.success("添加成功"); } else { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + }} else { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT); } } @@ -158,27 +163,27 @@ public class SupProductController { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk())); SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId()); - if (supProductEntity != null) { - return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); - } else { - supProductEntity = new SupProductEntity(); - BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); - supProductEntity.setProductId(selectProductBindRequest.getProductId()); - supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); - supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); - supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); - supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); - supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); - supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); - supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); - supProductEntity.setCreateTime(new Date()); - supProductEntity.setUpdateTime(new Date()); - supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); - supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); - supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); - supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); - supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); - } +// if (supProductEntity != null) { +// return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); +// } else { + supProductEntity = new SupProductEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + supProductEntity.setProductId(selectProductBindRequest.getProductId()); + supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); + supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); + supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); + supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); + supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); + supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); + supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); + supProductEntity.setCreateTime(new Date()); + supProductEntity.setUpdateTime(new Date()); + supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); + supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); + supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); + supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); + supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); +// } return ResultVOUtils.success(supProductEntity); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index d62b9cfc..4a62ef0a 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -16,7 +16,7 @@ import java.util.List; public interface SupProductDao extends BaseMapperPlus { SupProductEntity findRegistration(Long id); - + int findProduct(SupProductEntity supProductEntity); SupProductEntity findRegistrationByName(String recordProductName); List getRegistration(FilterPoductRequest filterPoductRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java index 02cb4ef8..d39ba59e 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupProductService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java @@ -35,7 +35,7 @@ public interface SupProductService extends IService { boolean modifyRegistration(SupProductEntity supProductEntity); boolean insertRegistration(SupProductEntity supProductEntity); - + int findProduct(SupProductEntity supProductEntity); boolean deleteById(@Param("id") String id); boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index e16d2736..42f6e6e1 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -147,7 +147,10 @@ public class SupProductServiceImpl extends ServiceImpl 0 ? true : false; } - + @Override + public int findProduct(SupProductEntity supProductEntity) { + return supProductDao.findProduct(supProductEntity); + } @Override public boolean deleteById(String id) { return supProductDao.deleteById(id); diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index b6457c82..5c9c70f0 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -377,7 +377,18 @@ #{hchzsb}, #{relIdFk}, #{manufactory}, #{allowNoBatch}, #{allowNoExpire}, #{allowNoProduct}, #{allowNoSerial}) - + DELETE FROM sup_product