|
@@ -1677,7 +1677,13 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
map.put("sumArrivalAmount",BigDecimal.ZERO);
|
|
|
map.put("sumQuantity",BigDecimal.ZERO);
|
|
|
map.put("list",new ArrayList<>());
|
|
|
- List<ContractVo> list = baseMapper.getCustomerMoney();
|
|
|
+ List<Long> authIdList = customerService.getAuthIdList();
|
|
|
+ List<ContractVo> list;
|
|
|
+ if(CollectionUtils.isNotEmpty(authIdList)){
|
|
|
+ list = baseMapper.getCustomerMoney(authIdList);
|
|
|
+ }else{
|
|
|
+ list = baseMapper.getCustomerMoney(null);
|
|
|
+ }
|
|
|
if(CollectionUtils.isNotEmpty(list)){
|
|
|
BigDecimal sumAmount = list.stream().map(ContractVo::getSumAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
|
BigDecimal sumQuantity = list.stream().map(ContractVo::getSumQuantity).reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
@@ -1687,8 +1693,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
item.setSellCorporationName(corporation.getName());
|
|
|
});
|
|
|
map.put("sumAmount",sumAmount);
|
|
|
- map.put("sumArrivalAmount",sumQuantity);
|
|
|
- map.put("sumQuantity",sumClaimMoney);
|
|
|
+ map.put("sumArrivalAmount",sumClaimMoney);
|
|
|
+ map.put("sumQuantity",sumQuantity);
|
|
|
map.put("list",list);
|
|
|
}
|
|
|
return map;
|