diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 2da83425..61650d51 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -136,7 +136,7 @@ public class PayCompanyManagementController extends JeroController implements IPayIncomeContractService { @@ -77,6 +79,28 @@ public class PayIncomeContractServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); + query.eq(PayIncomeContract::getContractNum,payIncomeContract.getContractNum()); + PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query); + if(!Objects.isNull(payIncomeContractNew)){ + throw new JeroBootException("合同编号已存在!"); + } + }catch (Exception e){ + log.info("收入合同-添加异常",e); + throw new JeroBootException("合同编号已存在!"); + } + try { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayIncomeContract::getContractName,payIncomeContract.getContractName()); + PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query); + if(!Objects.isNull(payIncomeContractNew)){ + throw new JeroBootException("合同名称已存在!"); + } + }catch (Exception e){ + log.info("收入合同-添加异常",e); + throw new JeroBootException("合同名称已存在!"); + } payIncomeContractService.save(payIncomeContract); StringBuilder msgPayIncomeContractInstallment = new StringBuilder(); if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){ @@ -113,6 +137,28 @@ public class PayIncomeContractServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); + query.eq(PayIncomeContract::getContractNum,payIncomeContract.getContractNum()); + PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query); + if(!Objects.isNull(payIncomeContractNew) && !Objects.equals(payIncomeContractNew.getId(),payIncomeContract.getId())){ + throw new JeroBootException("合同编号已存在!"); + } + }catch (Exception e){ + log.info("收入合同-添加异常",e); + throw new JeroBootException("合同编号已存在!"); + } + try { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayIncomeContract::getContractName,payIncomeContract.getContractName()); + PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query); + if(!Objects.isNull(payIncomeContractNew) && !Objects.equals(payIncomeContractNew.getId(),payIncomeContract.getId())){ + throw new JeroBootException("合同名称已存在!"); + } + }catch (Exception e){ + log.info("收入合同-添加异常",e); + throw new JeroBootException("合同名称已存在!"); + } StringBuilder msgPayIncomeContractInstallment = new StringBuilder(); if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){ List list = listPayIncomeContractInstallment.stream().map(PayIncomeContractInstallment::getId).collect(Collectors.toList());