公共询价单转询价报价单方法更新，增加报价应用记录，增加供应商企业相关信息

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

@@ -268,11 +268,17 @@ public class PublicInquiryItem implements Serializable {
 	private Short invalid;
 
 	/**
-	 * 应用来源ERP、B2B
+	 * 保存询价的应用
 	 */
 	@Column(name = "id_sourceapp")
 	private String sourceApp;
 
+    /**
+     * 报价的应用
+     */
+    @Column(name = "id_qutoapp")
+    private String qutoApp;
+
 	/**
 	 * 报价附件
 	 */
@@ -606,7 +612,15 @@ public class PublicInquiryItem implements Serializable {
 		this.sourceApp = sourceApp;
 	}
 
-	public Short getInvalidStatus() {
+    public String getQutoApp() {
+        return qutoApp;
+    }
+
+    public void setQutoApp(String qutoApp) {
+        this.qutoApp = qutoApp;
+    }
+
+    public Short getInvalidStatus() {
 		return invalidStatus;
 	}
 

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItemInfo.java

@@ -251,6 +251,12 @@ public class PublicInquiryItemInfo implements Serializable {
 	@Column(name = "id_sourceapp")
 	private String sourceApp;
 
+	/**
+	 * 报价的应用
+	 */
+	@Column(name = "id_fromapp")
+	private String fromApp;
+
 	/**
 	 * 需求数量
 	 */
@@ -567,6 +573,14 @@ public class PublicInquiryItemInfo implements Serializable {
 		this.sourceApp = sourceApp;
 	}
 
+	public String getFromApp() {
+		return fromApp;
+	}
+
+	public void setFromApp(String fromApp) {
+		this.fromApp = fromApp;
+	}
+
 	public Short getInvalidStatus() {
 		return invalidStatus;
 	}

src/main/java/com/uas/ps/inquiry/page/FilterCondition.java

@@ -1,35 +0,0 @@
-package com.uas.ps.inquiry.page;
-
-/**
- * 搜索过滤条件
- *
- * Created by hejq on 2018-01-19.
- */
-public class FilterCondition {
-
-    /**
-     * 关键字
-     */
-    private String key;
-
-    /**
-     * 值
-     */
-    private String value;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/uas/ps/inquiry/page/SearchFilter.java

@@ -58,11 +58,6 @@ public class SearchFilter {
 	 */
 	private Long userUU;
 
-	/**
-	 * 条件
-	 */
-	private List<FilterCondition> conditions;
-
 	public String getKeyword() {
 		return keyword;
 	}
@@ -136,11 +131,4 @@ public class SearchFilter {
 		this.userUU = userUU;
 	}
 
-	public List<FilterCondition> getConditions() {
-		return conditions;
-	}
-
-	public void setConditions(List<FilterCondition> conditions) {
-		this.conditions = conditions;
-	}
 }

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -187,9 +187,11 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             number = infoDao.countByInquiryId(inquiryItem.getInquiry().getId()) + 1;
         }
         if (null != inquiryItem) {
-            if (null == inquiryItem.getDate()) {
-                inquiryItem.setDate(new Date(System.currentTimeMillis()));
-            }
+            Enterprise enterprise = enterpriseDao.findOne(inquiryItem.getVendUU());
+            inquiryItem.setVendName(enterprise.getEnName());
+            inquiryItem.setBusinessCode(enterprise.getBusinesscode());
+            inquiryItem.setDate(new Date(System.currentTimeMillis()));
+            inquiryItem.setOfferTime(new Date(System.currentTimeMillis()));
             inquiryItem.setInquiry(inquiry);
             inquiryItem.setNumber((short) number);
             inquiryItem.setCustLap(Constant.NO);
@@ -263,9 +265,6 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             inquiry = inquiryDao.save(inquiry);
             inquiryItem.setVendUU(enuu);
             inquiryItem.setVendUserUU(useruu);
-            Enterprise enterprise = enterpriseDao.findOne(enuu);
-            inquiryItem.setVendName(enterprise.getEnName());
-            inquiryItem.setBusinessCode(enterprise.getBusinesscode());
             inquiryItem = SaveInquiryItems(inquiry, inquiryItem);
             if (null != inquiryItem.getId()) {
                 map.put("content", inquiryItem.getId());