|
@@ -209,6 +209,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
private Page<ContractVo> pageCommon(ContractSelectDto dto, IWrapper<Contract> wrapper) {
|
|
|
wrapper.orderByDesc("t1", Contract::getCreateTime);
|
|
|
wrapper.eq("t1", Contract::getIsChange, "0");//列表只展示未变更得数据
|
|
|
+ wrapper.ne("t1",Contract::getIsShow,1);
|
|
|
wrapper.between("t1", Contract::getStatus, FlowStatusEnum1.DRAFT.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
|
|
|
if (StringUtils.isNotEmpty(dto.getStatus())) {
|
|
|
wrapper.eq("t1", Contract::getStatus, dto.getStatus());
|
|
@@ -1623,12 +1624,21 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
map.put("sumAmount",BigDecimal.ZERO);
|
|
|
map.put("sumArrivalAmount",BigDecimal.ZERO);
|
|
|
map.put("sumQuantity",BigDecimal.ZERO);
|
|
|
+ map.put("list",new ArrayList<>());
|
|
|
List<ContractVo> list = baseMapper.getCustomerMoney();
|
|
|
- BigDecimal sumAmount = list.stream().map(ContractVo::getSumAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
|
- //赋值原卖方公司名称 多公司
|
|
|
- corporationService.attributeAssign(list, ContractVo::getSellCorporationId, (item, corporation) -> {
|
|
|
- item.setSellCorporationName(corporation.getName());
|
|
|
- });
|
|
|
- return 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);
|
|
|
+ BigDecimal sumClaimMoney = list.stream().map(ContractVo::getSumClaimMoney).reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
|
+ //赋值原卖方公司名称 多公司
|
|
|
+ corporationService.attributeAssign(list, ContractVo::getSellCorporationId, (item, corporation) -> {
|
|
|
+ item.setSellCorporationName(corporation.getName());
|
|
|
+ });
|
|
|
+ map.put("sumAmount",sumAmount);
|
|
|
+ map.put("sumArrivalAmount",sumQuantity);
|
|
|
+ map.put("sumQuantity",sumClaimMoney);
|
|
|
+ map.put("list",list);
|
|
|
+ }
|
|
|
+ return map;
|
|
|
}
|
|
|
}
|