|
|
@@ -128,7 +128,6 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
|
|
|
public HttpResult<PageResult<PtlAgreement>> pageAgreement(PtlAgreementPageVo ptlAgreementPageVo) {
|
|
|
int pageNum = ptlAgreementPageVo.getPageNum();
|
|
|
int pageSize = ptlAgreementPageVo.getPageSize();
|
|
|
- Page<PtlAgreement> ptlAgreementPage = new Page<>(pageNum, pageSize);
|
|
|
LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
|
|
|
// 获取供应商本级id 及其 下级id
|
|
|
List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
|
|
|
@@ -140,6 +139,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
|
|
|
.in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()), PtlAgreement::getPartnerCompaniesId, lowerId)
|
|
|
// 录入时间
|
|
|
.between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate()), PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
|
|
|
+ Page<PtlAgreement> ptlAgreementPage = new Page<>(pageNum, pageSize);
|
|
|
Page<PtlAgreement> agreementPage = page(ptlAgreementPage, wrapper);
|
|
|
PageResult<PtlAgreement> ptlAgreementPageResult = new PageResult<>(pageNum, pageSize, (int) agreementPage.getTotal(), agreementPage.getRecords());
|
|
|
return HttpResult.ok(ptlAgreementPageResult);
|