商机增加交期、税率返回

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

@@ -17,9 +17,33 @@ public class QuotationRspDTO implements Serializable {
      * 拒绝采纳理由
      */
     private String refusereason;
+    /**
+     * 交期
+     */
+    private Long leadTime;
+    /**
+     * 税率
+     */
+    private Double taxRate;
 
     private List<InquiryReplayDTO> replies;
 
+    public Long getLeadTime() {
+        return leadTime;
+    }
+
+    public void setLeadTime(Long leadTime) {
+        this.leadTime = leadTime;
+    }
+
+    public Double getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(Double taxRate) {
+        this.taxRate = taxRate;
+    }
+
     public Short getAgreed() {
         return agreed;
     }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -782,6 +783,8 @@ public class SaleServiceImpl implements SaleService{
                 if (!ObjectUtils.isEmpty(publicInquiryItem)) {
                     quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
                     quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
+                    quotationRspDTO.setLeadTime(publicInquiryItem.getLeadtime());
+                    quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
                     //分段报价明细
                     List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
                     List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();
@@ -829,6 +832,8 @@ public class SaleServiceImpl implements SaleService{
                 if (!ObjectUtils.isEmpty(publicInquiryItem)) {
                     quotationRspDTO.setAgreed(publicInquiryItem.getAgreed());
                     quotationRspDTO.setRefusereason(publicInquiryItem.getRefusereason());
+                    quotationRspDTO.setLeadTime(publicInquiryItem.getLeadtime());
+                    quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItem.getTaxrate()).doubleValue());
                     //分段报价明细
                     List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
                     List<PublicInquiryReply> publicInquiryReplyList = publicInquiryItem.getReplies();