diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index b3065051..7d94d1de 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -1115,7 +1115,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl importExcel(HttpServletRequest request, HttpServletResponse response) { String projectId = request.getParameter("projectId"); if (StringUtils.isBlank(projectId)) { @@ -253,6 +262,17 @@ public class PayMemberProjectSubitemController extends JeroController queryPayIncomeContract = new LambdaQueryWrapper(); + queryPayIncomeContract.eq(PayIncomeContract::getContractNum,projectSubitemExcel.getContractNo()); + queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,projectSubitemExcel.getCompanyId()); + List listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract); + if(CollectionUtils.isEmpty(listPayIncomeContract)){ + errorMessage.add("第" + errorRowNum + "行:合同号不存在"); + } + } + //复制属性 BeanUtils.copyProperties(projectSubitemExcel, projectSubitem); @@ -266,7 +286,7 @@ public class PayMemberProjectSubitemController extends JeroController"); + msg.append(s).append(",请修改!
"); } throw new JeroBootException(msg.toString()); }