diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java index d4db4f1a..d6c024d6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java @@ -1,21 +1,27 @@ package com.jero.member.controller; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; import com.jero.member.entity.PayMemberProject; +import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.IPayMemberProjectService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.project.common.PayProjectCommon; import lombok.extern.slf4j.Slf4j; @@ -48,6 +54,8 @@ public class PayMemberProjectController extends JeroController queryListByNotCompany(@RequestParam(name = "companyId") String companyId) { + if(StringUtils.isBlank(companyId)){ + return Result.error("企业id不能为空!"); + } + LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,companyId); + List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); + List list; + if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ + List listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayMemberProject = new LambdaQueryWrapper<>(); + queryPayMemberProject.notIn(PayMemberProject::getId,listId); + list = memberProjectService.list(queryPayMemberProject); + }else{ + list = memberProjectService.list(); + } + return Result.OK(list); + } + /** * 列表查询 */