|
@@ -3555,7 +3555,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
|
|
|
List<FinancialReceivablesMonthVo> otherList = baseMapper.queryDateByTypeByMonthOtherList(financialReceivablesQueryVo);
|
|
List<FinancialReceivablesMonthVo> otherList = baseMapper.queryDateByTypeByMonthOtherList(financialReceivablesQueryVo);
|
|
|
|
|
|
|
|
Map<String, FinancialReceivablesMonthVo> otherCollect = otherList.stream().collect(Collectors.toMap(FinancialReceivablesMonthVo::getPartnerCompaniesId, Function.identity()));
|
|
Map<String, FinancialReceivablesMonthVo> otherCollect = otherList.stream().collect(Collectors.toMap(FinancialReceivablesMonthVo::getPartnerCompaniesId, Function.identity()));
|
|
|
- Map<String, FinancialReceivablesMonthVo> commCollect= list.stream().collect(Collectors.toMap(FinancialReceivablesMonthVo::getPartnerCompaniesId, Function.identity()));
|
|
|
|
|
|
|
+// Map<String, FinancialReceivablesMonthVo> commCollect= list.stream().collect(Collectors.toMap(FinancialReceivablesMonthVo::getPartnerCompaniesId, Function.identity()));
|
|
|
list.forEach(item -> {
|
|
list.forEach(item -> {
|
|
|
if(otherCollect.containsKey(item.getPartnerCompaniesId())){
|
|
if(otherCollect.containsKey(item.getPartnerCompaniesId())){
|
|
|
FinancialReceivablesMonthVo otherItem = otherCollect.get(item.getPartnerCompaniesId());
|
|
FinancialReceivablesMonthVo otherItem = otherCollect.get(item.getPartnerCompaniesId());
|