diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java index da8bb5c4..e536bac5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java @@ -78,6 +78,25 @@ public class SupCompanyController { @PostMapping("/api/pur/addCompany") public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { + + //查询该用户对应的资质证书 + if(companyEntity.getAuditStatus()==6){ + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if(supCertEntityList.size()>0){ + for (SupCertEntity obj:supCertEntityList){ + if (StrUtil.isBlank(obj.getFilePath())){ + return ResultVOUtils.error(999,obj.getName()+"未上传资质证书!"); + } + } + } + } + + + + String customerId = CustomUtil.getId(); //重新生成customerId CustomerContactEntity customerContactEntity = new CustomerContactEntity(); customerContactEntity.setTel(companyEntity.getTel()); @@ -87,7 +106,7 @@ public class SupCompanyController { customerContactEntity.setCustomerId(customerId); customerContactService.insertCustomerContact(customerContactEntity); //更新相关证书对应的customerId - supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId); + supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId,ConstantStatus.AUDIT_UN); companyEntity.setCustomerId(customerId); companyEntity.setCreateTime(new Date()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java index 6cc2f723..50a59fa1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java @@ -23,7 +23,7 @@ public interface SupCertDao { boolean deleteById(String id); - boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId); + boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId,@Param("auditStatus") Integer auditStatus); boolean updateManufacturerId(@Param("oldCustomerId") String oldCustomerId, @Param("newCustomerId") String newCustomerId, @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java index b61f84b8..4d1fa69c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java @@ -23,7 +23,7 @@ public interface SupCertService { boolean updateCompanyCert(SupCertEntity supCertEntity); - boolean updateCustomerId(String oldId, String newId); + boolean updateCustomerId(String oldId, String newId,Integer auditStatus); boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java index 236330e1..a592e0b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java @@ -94,8 +94,8 @@ public class SupCertServiceImpl implements SupCertService { } @Override - public boolean updateCustomerId(String oldId, String newId) { - return supCertDao.updateCustomerId(oldId, newId); + public boolean updateCustomerId(String oldId, String newId,Integer auditStatus) { + return supCertDao.updateCustomerId(oldId, newId,auditStatus); } @Override 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 d602bd61..6b8253c7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -88,7 +88,11 @@ UPDATE sup_cert set customerId = #{newId} + + ,auditStatus = #{auditStatus} + WHERE customerId = #{oldId} +