|
|
@@ -3104,6 +3104,11 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
log.info(msg);
|
|
|
return HttpResult.error(msg, Collections.emptyList());
|
|
|
}
|
|
|
+ // add by lipf, 前端保险公司的查询条件未生效,进行bug修复
|
|
|
+ if(StrUtil.isNotEmpty(queryVo.getCompanyId())){
|
|
|
+ allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream()
|
|
|
+ .filter(action-> queryVo.getCompanyId().equals(action.getCompanyId())).toList();
|
|
|
+ }
|
|
|
// 2. 汇总后,计算得到已开票,未开票,已结算,未结算的数据
|
|
|
allCompaniesIncomeDatas = this.calStatisAmount(allCompaniesIncomeDatas, queryVo, systemCode);
|
|
|
// 3. 填充保险公司的父级保险公司
|