diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java index 2b03d77f..76d7bdae 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -69,7 +69,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList()); LambdaQueryWrapper queryPayPackCompanyProject = new LambdaQueryWrapper<>(); - queryPayPackCompanyProject.in(PayPackCompanyProject::getProjectId,listPayPackCompanyId); - queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayProjectCommon.PROJECT_TYPE1); + queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId); + queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1); List listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ List listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList()); @@ -211,7 +211,7 @@ public class PayCommonProjectController extends JeroController listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList()); LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); - queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId,listId); + queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId); queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1); List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 385eb9ae..68e0f04f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -178,8 +178,8 @@ public class PayWorkingGroupSubItemController extends JeroController listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList()); LambdaQueryWrapper queryPayPackCompanyProject = new LambdaQueryWrapper<>(); - queryPayPackCompanyProject.in(PayPackCompanyProject::getProjectId,listPayPackCompanyId); - queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayProjectCommon.PROJECT_TYPE1); + queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId); + queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1); List listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ List listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList()); @@ -193,7 +193,7 @@ public class PayWorkingGroupSubItemController extends JeroController listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList()); LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); - queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId,listId); + queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId); queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1); List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){