|
@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.account.controller.utils.DateUtils;
|
|
|
-import com.fjhx.account.entity.write.vo.WriteOffRecordsVo;
|
|
|
import com.fjhx.area.utils.CustomizeAreaUtil;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
import com.fjhx.common.entity.contract.po.ContractTemplate;
|
|
@@ -24,6 +23,7 @@ import com.fjhx.customer.entity.customer.po.Customer;
|
|
|
import com.fjhx.customer.entity.customer.vo.CustomerVo;
|
|
|
import com.fjhx.customer.service.customer.CustomerService;
|
|
|
import com.fjhx.flow.service.flow.FlowExampleService;
|
|
|
+import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
|
|
|
import com.fjhx.sale.entity.contract.vo.ContractVo;
|
|
|
import com.fjhx.sale.entity.quotation.po.QuotationPay;
|
|
|
import com.fjhx.sale.entity.quotation.po.QuotationProduct;
|
|
@@ -278,11 +278,19 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
|
|
|
corporationService.attributeAssign(contractVoList, ContractVo::getSellCorporationId, (item, corporation) -> {
|
|
|
item.setSellCorporationName(corporation.getName());
|
|
|
});
|
|
|
- map.put("contractList",page);
|
|
|
+ map.put("contractList", page);
|
|
|
|
|
|
Integer count = this.getCount(dto.getId());
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
map.put("count", count);
|
|
|
+
|
|
|
+
|
|
|
+ ContractSelectDto dto1 = new ContractSelectDto();
|
|
|
+ dto1.setBuyCorporationId(dto.getId());
|
|
|
+ Map<String, Object> profitBudgetHeadStatistic = contractService.getProfitBudgetHeadStatistic(dto1);
|
|
|
+ Object grossProfitSum = profitBudgetHeadStatistic.get("grossProfitSum");
|
|
|
+ contractVo.setProfitAmount(new BigDecimal(grossProfitSum.toString()));
|
|
|
+
|
|
|
return map;
|
|
|
}
|
|
|
|