LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收入合同关联会员项目

Browse Source
This commit is contained in:
梁琦涛
2021-09-18 14:02:22 +08:00
parent f6962a0af3
commit 0e8d0d02a0
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+33
View File
@@ -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<PayMemberProject,
private IPayIncomeContractService payIncomeContractService;
@Resource
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Resource
private IPayMemberProjectSubitemService memberProjectSubitemService;
/**
@@ -113,6 +121,31 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
return Result.OK(null);
}
/**
* 收入合同-查询非企业id的项目
*/
@AutoLog(value = "会员项目表-收入合同-查询非企业id的项目")
@ApiOperation(value="会员项目表-收入合同-查询非企业id的项目", notes="会员项目表-收入合同-查询非企业id的项目")
@GetMapping(value = "/queryListByNotCompany")
public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
if(StringUtils.isBlank(companyId)){
return Result.error("企业id不能为空！");
}
LambdaQueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new LambdaQueryWrapper<>();
queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,companyId);
List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem);
List<PayMemberProject> list;
if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){
List<String> listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList());
LambdaQueryWrapper<PayMemberProject> queryPayMemberProject = new LambdaQueryWrapper<>();
queryPayMemberProject.notIn(PayMemberProject::getId,listId);
list = memberProjectService.list(queryPayMemberProject);
}else{
list = memberProjectService.list();
}
return Result.OK(list);
}
/**
* 列表查询
*/