From bb0a7ef67c3cc1e16d81c711cfb4d5f5f4ff2494 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Fri, 18 Nov 2022 18:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purechase/SupManufacturerController.java | 52 +++++++++++++++++++ .../purechase/SupProductController.java | 7 +++ .../purchase/SupManufacturerEntity.java | 1 + .../FilterSupManufacturerRequest.java | 1 + .../mybatis/mapper/purchase/SupCertDao.xml | 10 ++-- .../mapper/purchase/SupManufacturerDao.xml | 6 ++- 6 files changed, 71 insertions(+), 6 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 730a9e6..1133fda 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 @@ -6,17 +6,21 @@ import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.purchase.SupCertEntity; import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.FilterCompanyRequest; import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.purchase.SupCertService; import com.glxp.sale.admin.service.purchase.SupCertSetService; import com.glxp.sale.admin.service.purchase.SupCompanyService; @@ -51,6 +55,8 @@ public class SupManufacturerController { private SupCompanyService supCompanyService; @Resource SupCertSetService supCertSetService; + @Resource + private CompanyService companyService; @AuthRuleAnnotation("") @GetMapping("/sup/manufacturer/getCompanyInfo") @@ -93,6 +99,22 @@ public class SupManufacturerController { supManufacturerEntity.setCustomerId(customerId); + //判断用户名和社会信用代码不能重复 + FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest(); + filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName()); + filterSupManufacturerRequest.setCustomerId(getCustomerId()); + List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + if(companyEntities.size()>0){ + return ResultVOUtils.error(999,"企业名称不能重复！"); + } + filterSupManufacturerRequest=new FilterSupManufacturerRequest(); + filterSupManufacturerRequest.setCustomerId(getCustomerId()); + filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode()); + companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + if(companyEntities.size()>0){ + return ResultVOUtils.error(999,"统一社会信用代码不能重复！"); + } + supManufacturerEntity.setCreateTime(new Date()); supManufacturerEntity.setUpdateTime(new Date()); @@ -178,6 +200,36 @@ public class SupManufacturerController { if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { return ResultVOUtils.error(500, "参数错误！"); } + + + //判断用户名和社会信用代码不能重复 +// FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest(); +// filterSupManufacturerRequest.setId(supManufacturerEntity.getId()); +// List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); +// if(companyEntities.size()>0){ + + FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest(); + filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName()); + filterSupManufacturerRequest.setId(supManufacturerEntity.getId()); + filterSupManufacturerRequest.setCustomerId(getCustomerId()); + filterSupManufacturerRequest.setType(1); + List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + if(companyEntities.size()>0){ + return ResultVOUtils.error(999,"企业名称不能重复！"); + } + filterSupManufacturerRequest=new FilterSupManufacturerRequest(); + filterSupManufacturerRequest.setCustomerId(getCustomerId()); + filterSupManufacturerRequest.setId(supManufacturerEntity.getId()); + filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode()); + filterSupManufacturerRequest.setType(1); + companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + if(companyEntities.size()>0){ + return ResultVOUtils.error(999,"统一社会信用代码不能重复！"); + } +// } + + + //提交审核 if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { //判断是否上级供应商是否审核通过 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 7085423..9437862 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 @@ -205,6 +205,13 @@ public class SupProductController { return ResultVOUtils.error(500, "参数错误！"); } + //判断是不是存在草稿 + List supCertEntityList1 = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); + for(SupCertEntity obj:supCertEntityList1){ + if(obj.getAuditStatus()==0){ + return ResultVOUtils.error(999,"证书中存在草稿不允许提交！"); + } + } //提交审核 if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { //判断是否上级供应商是否审核通过 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java index f500382..c4d814e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java @@ -36,5 +36,6 @@ public class SupManufacturerEntity { private Integer auditStatus; private String supName; private String auditComment; + private Integer auditType; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java index 8289659..9a8edae 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java @@ -14,4 +14,5 @@ public class FilterSupManufacturerRequest extends ListPageRequest { private Integer auditStatus; private String manufacturerId; private String lastUpdateTime; + private Integer type; } 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 360d38d..8e44f35 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} @@ -28,7 +28,9 @@ and (auditStatus = 2 or auditStatus=3 or auditStatus=5 or auditStatus=6) - + + and (auditStatus !=0) + ORDER BY id DESC @@ -68,8 +70,8 @@ remark=#{remark}, createTime=#{createTime}, updateTime=#{updateTime}, - vailDate=#{vailDate}, - expireDate=#{expireDate}, + vailDate=#{vailDate}, + expireDate=#{expireDate}, `type`=#{type}, `manufacturerIdFk`=#{manufacturerIdFk}, `productIdFk`=#{productIdFk}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml index 56fb812..4a09bce 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -22,7 +22,7 @@ SELECT sup_manufacturer.* ,company.companyName as supName FROM sup_manufacturer inner join company on sup_manufacturer.customerId = company.customerId - + and id = #{id} @@ -59,7 +59,9 @@ = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> - + + and id != #{id} +