询价税率、电话、替代型号修改

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/QuotationRspDTO.java

@@ -14,7 +14,7 @@ public class QuotationRspDTO implements Serializable {
     private String tel;
     private String replaceOrispeccode;
     private Long leadTime;
-    private Double texRate;
+    private Double taxRate;
     /**
      * 是否采纳 1 为已采纳 0为已拒绝  空 未处理
      */
@@ -66,12 +66,12 @@ public class QuotationRspDTO implements Serializable {
         this.leadTime = leadTime;
     }
 
-    public Double getTexRate() {
-        return texRate;
+    public Double getTaxRate() {
+        return taxRate;
     }
 
-    public void setTexRate(Double texRate) {
-        this.texRate = texRate;
+    public void setTaxRate(Double taxRate) {
+        this.taxRate = taxRate;
     }
 
     public Short getAgreed() {

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -2,11 +2,11 @@ package com.usoftchina.saas.purchase.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.api.SearchApi;
-import com.usoftchina.inquiry.po.inquiry.*;
-import com.usoftchina.inquiry.po.search.ProductEntity;
-import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.inquiry.api.InquiryApi;
+import com.usoftchina.saas.inquiry.api.SearchApi;
+import com.usoftchina.saas.inquiry.po.inquiry.*;
+import com.usoftchina.saas.inquiry.po.search.ProductEntity;
+import com.usoftchina.saas.inquiry.po.search.SearchComponentResp;
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
@@ -825,12 +825,12 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                     QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
                     quotationRspDTO.setId(publicInquiryItem.getId());
                     quotationRspDTO.setVendName(publicInquiryItem.getVendName());
-                    quotationRspDTO.setTexRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
+                    quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
                     quotationRspDTO.setLeadTime(publicInquiryItem.getLeadtime());
-                    quotationRspDTO.setTel(publicInquiryItem.getUserTel());
+                    quotationRspDTO.setTel(publicInquiryItem.getUser().getUserTel());
                     quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
                     quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
-                    quotationRspDTO.setReplaceOrispeccode(publicInquiryItem.getCmpCode());
+                    quotationRspDTO.setReplaceOrispeccode(publicInquiryItem.getReplaceCmpCode());
                     //分段报价信息
                     List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
                     List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();