|
@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.account.controller.utils.DateUtils;
|
|
|
import com.fjhx.area.utils.CustomizeAreaUtil;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
+import com.fjhx.common.entity.contract.po.ContractTemplate;
|
|
|
+import com.fjhx.common.entity.corporation.po.Corporation;
|
|
|
+import com.fjhx.common.service.contract.ContractTemplateService;
|
|
|
import com.fjhx.common.service.corporation.CorporationService;
|
|
|
import com.fjhx.customer.entity.customer.dto.CustomerDto;
|
|
|
import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
|
|
@@ -79,6 +82,8 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
|
|
|
|
|
|
@Autowired
|
|
|
private CorporationService corporationService;
|
|
|
+ @Autowired
|
|
|
+ private ContractTemplateService contractTemplateService;
|
|
|
|
|
|
/**
|
|
|
* 报价表分页
|
|
@@ -127,6 +132,22 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
|
|
|
SaleQuotation SaleQuotation = this.getById(id);
|
|
|
SaleQuotationVo result = BeanUtil.toBean(SaleQuotation, SaleQuotationVo.class);
|
|
|
if (ObjectUtil.isNotEmpty(result)) {
|
|
|
+ //赋值合同模板名称
|
|
|
+ ContractTemplate contractTemplate = contractTemplateService.getById(result.getContractTemplateId());
|
|
|
+ if(ObjectUtil.isNotEmpty(contractTemplate)){
|
|
|
+ result.setContractTemplateName(contractTemplate.getTemplateName());
|
|
|
+ }
|
|
|
+ //赋值买方公司名称(客户)
|
|
|
+ Customer customer = customerService.getById(result.getBuyCorporationId());
|
|
|
+ if(ObjectUtil.isNotEmpty(customer)){
|
|
|
+ result.setBuyCorporationName(customer.getName());
|
|
|
+ }
|
|
|
+ //赋值卖方公司名称(多公司)
|
|
|
+ Corporation corporation = corporationService.getById(result.getSellCorporationId());
|
|
|
+ if(ObjectUtil.isNotEmpty(corporation)){
|
|
|
+ result.setSellCorporationName(corporation.getName());
|
|
|
+ }
|
|
|
+
|
|
|
//赋值买方公司地址
|
|
|
setArea(result);
|
|
|
//查询报价-商品表的详情
|