|
|
@@ -396,9 +396,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public HttpResult<List<InsPlyIncome>> queryIncomeDatas(IncomeDataVO incomeDataVO) {
|
|
|
log.info("应收数据的二次过滤:incomeDataVO=[{}]", JSONUtil.toJsonStr(incomeDataVO));
|
|
|
+ // add by lipf ,二次过滤查询可开票订单的时候,应该查询未开票的订单
|
|
|
List<String> orderNos = incomeDataVO.getOrderNos();
|
|
|
String companyId = incomeDataVO.getCompanyId();
|
|
|
- List<InsPlyIncome> incomes = baseMapper.queryIncomeDatasByOrderIds(orderNos,companyId);
|
|
|
+ List<InsPlyIncome> incomes = baseMapper.queryIncomeDatasByOrderIds(orderNos,companyId,incomeDataVO.getInvoiceType());
|
|
|
log.info("根据订单号和保司id查询出[{}]条记录。 orderNos =[{}],companyId=[{}]",CollUtil.size(incomes), JSONUtil.toJsonStr(orderNos), companyId);
|
|
|
// 需要查询未结算的数据 modify by lipf 2026年6月4日11:06:50
|
|
|
incomes = incomes.stream().filter(action->{
|