采购询价及相关数据处理方法更改，以前的公共询价存入询价单表方法更新为最新的方法

src/main/java/com/uas/platform/b2b/service/impl/PurcInquiryServiceImpl.java

@@ -111,6 +111,12 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 	@Autowired
     private RoleService roleService;
 
+	@Autowired
+	private PublicInquiryItemDao publicInquiryItemDao;
+
+	@Autowired
+    private PublicInquiryDao publicInquiryDao;
+
 	@Override
 	public ModelMap save(PurcInquiryInfo inquiryInfo, List<VendorAndContact> contacts, FileUpload uploadItem) {
 		ModelMap map = new ModelMap();
@@ -771,11 +777,13 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 		map.put("inquiryItem", inquiryItem);
 		PurcInquiryItem purcInquiryItem = purcInquiryItemDao.findOne(id);
 		PurcInquiry purcInquiry = purcInquiryItem.getInquiry();
-		PurchaseInquiry inquiry = purchaseInquiryDao.findBySourceIdAndSourceApp(purcInquiry.getId(), SOURCERAPP);
+//		PurchaseInquiry inquiry = purchaseInquiryDao.findBySourceIdAndSourceApp(purcInquiry.getId(), SOURCERAPP);
+		PublicInquiry inquiry = publicInquiryDao.findBySourceIdAndSourceApp(purcInquiry.getId(), SOURCERAPP);
 		if (null != inquiry) {
-			PurchaseInquiryItem purcItem = purchaseInquiryItemDao
-					.findByVendUUAndSourceId(SystemSession.getUser().getEnterprise().getUu(), id);
-			if (purcItem != null) {
+//			PurchaseInquiryItem purcItem = purchaseInquiryItemDao
+//					.findByVendUUAndSourceId(SystemSession.getUser().getEnterprise().getUu(), id);
+			PublicInquiryItem item = publicInquiryItemDao.findByVendUUAndSourceId(SystemSession.getUser().getEnterprise().getUu(), id);
+			if (item != null) {
 				map.put("id", inquiry.getId());
 			}
 		}

src/main/java/com/uas/platform/b2b/temporary/model/InquiryDetailInfo.java

@@ -11,7 +11,6 @@ import com.uas.platform.b2b.model.EnterpriseInfo;
 
 public class InquiryDetailInfo {
 
-	@Id
 	private Long id;
 
 	/**
@@ -42,25 +41,21 @@ public class InquiryDetailInfo {
 	/**
 	 * 录入人
 	 */
-	@Column(name = "in_recorder")
 	private String recorder;
 
 	/**
 	 * 审核人
 	 */
-	@Column(name = "in_auditor")
 	private String auditor;
 
 	/**
 	 * 报价截止日期
 	 */
-	@Column(name = "in_enddate")
 	private Date endDate;
 
 	/**
 	 * 备注
 	 */
-	@Column(name = "in_remark")
 	private String remark;
 
 	/**

src/main/java/com/uas/platform/b2b/temporary/model/InquiryProductInfo.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.temporary.model;
 
+import com.uas.platform.b2b.model.PublicInquiryItemInfo;
 import com.uas.platform.b2b.model.PurchaseInquiryItemInfo;
 
 import java.util.Set;
@@ -41,6 +42,11 @@ public class InquiryProductInfo {
 	 */
 	private Set<PurchaseInquiryItemInfo> inquiryItems;
 
+	/**
+	 * 公共询价信息明细
+	 */
+	private Set<PublicInquiryItemInfo> publicInquiryItemInfos;
+
 	public Long getId() {
 		return id;
 	}
@@ -97,4 +103,11 @@ public class InquiryProductInfo {
 		this.inquiryItems = inquiryItems;
 	}
 
+	public Set<PublicInquiryItemInfo> getPublicInquiryItemInfos() {
+		return publicInquiryItemInfos;
+	}
+
+	public void setPublicInquiryItemInfos(Set<PublicInquiryItemInfo> publicInquiryItemInfos) {
+		this.publicInquiryItemInfos = publicInquiryItemInfos;
+	}
 }