|
@@ -19,6 +19,7 @@ import com.fjhx.common.service.corporation.CorporationService;
|
|
|
import com.fjhx.common.utils.Assert;
|
|
|
import com.fjhx.common.utils.ExchangeRateUtil;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
+import org.jetbrains.annotations.Contract;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -76,10 +77,17 @@ public class TransactionServiceImpl extends ServiceImpl<TransactionMapper, Trans
|
|
|
@Override
|
|
|
public Map<String,Object> getHeadStatistic(TransactionSelectDto dto) {
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
- List<Transaction> list = this.baseMapper.getHeadStatistic(setWrapper(dto));
|
|
|
- BigDecimal incMoney = list.stream().filter(s ->s.getType() == 1).map(Transaction::getSumAmount).reduce(BigDecimal.ZERO,BigDecimal::add);//应收款
|
|
|
- BigDecimal expMoney = list.stream().filter(s ->s.getType() == 0).map(Transaction::getSumAmount).reduce(BigDecimal.ZERO,BigDecimal::add);//应付款
|
|
|
- Map<Long,List<Transaction>> traMap = list.stream().collect(Collectors.groupingBy(Transaction::getCorporationId));
|
|
|
+ IWrapper<Transaction> wrapper = setWrapper(dto);
|
|
|
+ wrapper.isNotNull("t.corporation_id");
|
|
|
+ wrapper.groupBy("t.corporation_id","t.type");
|
|
|
+ List<TransactionVo> list = this.baseMapper.getHeadStatistic(wrapper);
|
|
|
+ //赋值归属公司名称
|
|
|
+ corporationService.attributeAssign(list, TransactionVo::getCorporationId, (item, corporation) -> {
|
|
|
+ item.setCorporationName(corporation.getName());
|
|
|
+ });
|
|
|
+ BigDecimal incMoney = list.stream().filter(s ->s.getType() == 1).map(TransactionVo::getSumAmount).reduce(BigDecimal.ZERO,BigDecimal::add);//应收款
|
|
|
+ BigDecimal expMoney = list.stream().filter(s ->s.getType() == 0).map(TransactionVo::getSumAmount).reduce(BigDecimal.ZERO,BigDecimal::add);//应付款
|
|
|
+ Map<String,List<TransactionVo>> traMap = list.stream().collect(Collectors.groupingBy(TransactionVo::getCorporationName));
|
|
|
map.put("incMoney",incMoney);
|
|
|
map.put("expMoney",expMoney);
|
|
|
map.put("tranList",traMap);
|