|
|
|
@ -252,6 +252,11 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
|
|
|
|
|
voucherNum++;
|
|
|
|
|
voucherQueryWrapper.like("a.contract_no",voucherPagination.getContractNo());
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
if(ObjectUtil.isNotEmpty(voucherPagination.getProductName())){
|
|
|
|
|
voucherNum++;
|
|
|
|
|
voucherQueryWrapper.like("f.name",voucherPagination.getProductName());
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(voucherPagination.getDeliveryType())){
|
|
|
|
@ -600,8 +605,11 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
|
|
|
|
|
queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
|
|
|
|
|
queryWrapper.eq("a.delivery_type","2");
|
|
|
|
|
queryWrapper.eq("a.voucher_status","4");
|
|
|
|
|
// queryWrapper.eq(StringUtils.isNotEmpty(voucherPagination.getContractNo()),"a.contract_no",voucherPagination.getContractNo());
|
|
|
|
|
// queryWrapper.eq(StringUtils.isNotEmpty(voucherPagination.getProductName()),"f.name",voucherPagination.getProductName());
|
|
|
|
|
if (StringUtils.isNotEmpty(voucherPagination.getKeyword())) {
|
|
|
|
|
queryWrapper.and(wrapper -> wrapper.like("a.contract_no", voucherPagination.getKeyword())
|
|
|
|
|
.or().like("f.name", voucherPagination.getKeyword())
|
|
|
|
|
.or().like("a.voucher_code",voucherPagination.getKeyword()));
|
|
|
|
|
}
|
|
|
|
|
queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
|
|
|
|
|
queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList());
|
|
|
|
|
queryWrapper.isNull("a.f_delete_mark");
|
|
|
|
|