|
@@ -3,6 +3,8 @@ package com.fjhx.sale.service.contract.impl;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import com.fjhx.common.entity.corporation.po.Corporation;
|
|
|
+import com.fjhx.common.service.corporation.CorporationService;
|
|
|
import com.fjhx.customer.entity.customer.po.Customer;
|
|
|
import com.fjhx.customer.entity.customer.vo.CustomerFollowRecordsVo;
|
|
|
import com.fjhx.customer.service.customer.CustomerService;
|
|
@@ -10,6 +12,7 @@ import com.fjhx.purchase.entity.invoice.po.Invoice;
|
|
|
import com.fjhx.purchase.entity.invoice.po.InvoiceDetails;
|
|
|
import com.fjhx.purchase.entity.invoice.vo.InvoiceDetailsVo;
|
|
|
import com.fjhx.purchase.entity.invoice.vo.InvoiceVo;
|
|
|
+import com.fjhx.purchase.entity.subscribe.vo.SubscribeDetailVo;
|
|
|
import com.fjhx.sale.entity.contract.po.ContractInvoice;
|
|
|
import com.fjhx.sale.entity.contract.po.ContractInvoiceDetails;
|
|
|
import com.fjhx.sale.entity.contract.vo.ContractInvoiceDetailsVo;
|
|
@@ -59,6 +62,9 @@ public class ContractInvoiceServiceImpl extends ServiceImpl<ContractInvoiceMappe
|
|
|
|
|
|
@Autowired
|
|
|
private CustomerService customerService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private CorporationService corporationService;
|
|
|
/**
|
|
|
* 分页
|
|
|
* @param dto
|
|
@@ -81,6 +87,10 @@ public class ContractInvoiceServiceImpl extends ServiceImpl<ContractInvoiceMappe
|
|
|
customerService.attributeAssign(list, ContractInvoiceVo::getCustomerId, (item, customer) -> {
|
|
|
item.setCustomerName(customer.getName());
|
|
|
});
|
|
|
+ //赋值归属公司
|
|
|
+ corporationService.attributeAssign(list, ContractInvoiceVo::getCorporationId, (item, corporation) -> {
|
|
|
+ item.setCorporationName(corporation.getName());
|
|
|
+ });
|
|
|
UserUtil.assignmentNickName(list, BasePo::getCreateUser, ContractInvoiceVo::setUserName);
|
|
|
}
|
|
|
return page;
|
|
@@ -100,6 +110,8 @@ public class ContractInvoiceServiceImpl extends ServiceImpl<ContractInvoiceMappe
|
|
|
}
|
|
|
Customer customer = customerService.getById(result.getCustomerId());
|
|
|
result.setCustomerName(ObjectUtils.isEmpty(customer)?"":customer.getName());
|
|
|
+ Corporation corporation = corporationService.getById(result.getCorporationId());
|
|
|
+ result.setCorporationName(ObjectUtils.isEmpty(corporation)?"":corporation.getName());
|
|
|
List<ContractInvoiceDetailsVo> invoiceDetailsVos = contractInvoiceDetailsService.getDetail(id);
|
|
|
List<Long> ids = invoiceDetailsVos.stream().distinct().map(ContractInvoiceDetailsVo::getContractId).collect(Collectors.toList());
|
|
|
List<ContractInvoiceDetailsVo> invoiceDetailsList = contractInvoiceDetailsService.getSumMoneyByContractIds(ids);
|