客户采购询价单据过滤条件更改。这个版本发布正式的时候说一下，需要修改视图。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9996 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -217,11 +217,11 @@ public class PurchaseInquiryItem {
 	private Date erpDate;
 
 	/**
-	 * 录入时间
+	 * 录入时间(取主表日期字段)
 	 *
 	 * @return
 	 */
-	@Column(name = "id_date")
+	@Column(name = "id_date", insertable = false, updatable = false)
 	private Date date;
 
 	/**
@@ -233,7 +233,7 @@ public class PurchaseInquiryItem {
 	 *
 	 *   （1为已提交， 0为被反提交， null为未提交）
 	 */
-	@Column(name = "id_overdue")
+	@Column(name = "id_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
 	/**

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

@@ -1,45 +1,13 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import com.uas.platform.b2b.dao.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadUtils;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDetail;
-import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemSaveEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurcInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryReply;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.UserBaseInfo;
+import com.uas.platform.b2b.event.*;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
@@ -55,6 +23,20 @@ import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.*;
 
 
 @Service
@@ -224,8 +206,10 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
     @Override
     public ModelMap addAttaches(Long itemId, FileUpload uploadItem) throws Exception {
 		PurchaseInquiryItem inquiryItem = purchaseInquiryItemDao.findOne(itemId);
+		ModelMap map = new ModelMap();
 		if (uploadItem.getFile() == null) {
-			throw new Exception("没有附件");
+			map.put("success", "没有附件");
+			return map;
 		}
 		Attach attach = attachService.upload(uploadItem, "PurchaseInquiryItemAttaches", "采购询价单报价附件");
 		if (attach == null) {
@@ -236,7 +220,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		attachSet.add(attach);
 		inquiryItem.setAttaches(attachSet);
 		purchaseInquiryItemDao.save(inquiryItem);
-		ModelMap map = new ModelMap();
 		map.put("success", true);
 		return map;
     }
@@ -263,9 +246,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 					if (!CollectionUtils.isEmpty(filter.getDistribute()))
 						pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
 					if (filter.getFromDate() != null)
-						pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+						pageInfo.expression(PredicateUtils.gte("inquiry.date", new Date(filter.getFromDate()), false));
 					if (filter.getEndDate() != null)
-						pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+						pageInfo.expression(PredicateUtils.lte("inquiry.date", new Date(filter.getEndDate()), false));
 				}
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();