|
|
|
@ -764,6 +764,12 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<VoucherEntity> queryVoucherPopupInfo(VoucherPagination voucherPagination) {
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
|
|
|
|
|
List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
|
|
|
|
|
String organize = JSON.toJSONString(organizeJsonId);
|
|
|
|
|
organize = organize.replace("[", "");
|
|
|
|
|
organize = organize.replace("]", "");
|
|
|
|
|
QueryWrapper<VoucherEntity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper1.eq("a.business_type",voucherPagination.getBusinessType());
|
|
|
|
|
queryWrapper1.eq("a.document_type",voucherPagination.getDocumentType());
|
|
|
|
@ -775,18 +781,14 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
|
|
|
|
|
.or().like("a.voucher_code",voucherPagination.getKeyword()));
|
|
|
|
|
}
|
|
|
|
|
queryWrapper1.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
|
|
|
|
|
queryWrapper1.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()), "c.product_id", voucherPagination.getProductIdList());
|
|
|
|
|
queryWrapper1.isNull("a.f_delete_mark");
|
|
|
|
|
queryWrapper1.like("a.organize_json_id", organize);
|
|
|
|
|
queryWrapper1.eq(StringUtils.isNotEmpty(voucherPagination.getBusinessOrderId()),"a.business_order_id",voucherPagination.getBusinessOrderId());
|
|
|
|
|
IPage<VoucherEntity> voucherEntityIPage = new Page<>();
|
|
|
|
|
Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
|
|
|
|
|
voucherEntityIPage = voucherMapper.queryVoucherPopup(page, queryWrapper1,voucherPagination.getBusinessType(),voucherPagination.getDocumentType());
|
|
|
|
|
if (voucherEntityIPage.getTotal() == 0) {
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
|
|
|
|
|
List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
|
|
|
|
|
String organize = JSON.toJSONString(organizeJsonId);
|
|
|
|
|
organize = organize.replace("[", "");
|
|
|
|
|
organize = organize.replace("]", "");
|
|
|
|
|
QueryWrapper<VoucherEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.eq("a.business_type", voucherPagination.getBusinessType());
|
|
|
|
|
queryWrapper.eq("a.document_type", voucherPagination.getDocumentType());
|
|
|
|
|