修改模具询价实体类中getoverdue方法。根据enddate来判断。

search-console-b2b/src/main/java/com/uas/search/console/b2b/dao/PurchaseInquiryMouldDetailSimpleInfoDao.java

@@ -4,7 +4,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 import com.uas.search.console.b2b.model.PurchaseInquiryMouldDetailSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryMouldSimpleInfo;
 
 public interface PurchaseInquiryMouldDetailSimpleInfoDao 
 		extends JpaRepository<PurchaseInquiryMouldDetailSimpleInfo, Long>,

search-console-b2b/src/main/java/com/uas/search/console/b2b/dao/PurchaseInquiryMouldItemSimpleInfoDao.java

@@ -4,7 +4,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 import com.uas.search.console.b2b.model.PurchaseInquiryMouldItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryMouldSimpleInfo;
 
 public interface PurchaseInquiryMouldItemSimpleInfoDao 
 		extends JpaRepository<PurchaseInquiryMouldItemSimpleInfo, Long>,

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseInquiryMouldSimpleInfo.java

@@ -1,6 +1,7 @@
 package com.uas.search.console.b2b.model;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -27,7 +28,7 @@ public class PurchaseInquiryMouldSimpleInfo {
 	/**
 	 * 表名
 	 */
-	public static final String TABLE_NAME = "V$PURC$INQUIRY_MOULD";
+	public static final String TABLE_NAME = "PURC$INQUIRYMOULD";
 
 	/**
 	 * 各字段名
@@ -42,6 +43,8 @@ public class PurchaseInquiryMouldSimpleInfo {
 
 	public static final String DATE_FIELD = "im_date";
 
+	public static final String ENDDATE_FIELD = "im_enddate";
+
 	public static final String STATUS_FIELD = "im_status";
 
 	public static final String ADOPTSTATUS_FIELD = "im_adoptstatus";
@@ -96,7 +99,6 @@ public class PurchaseInquiryMouldSimpleInfo {
 	/**
 	 * 是否过期
 	 */
-	@Column(name = OVERDUE_FIELD)
 	private Short overdue;
 
 	/**
@@ -105,6 +107,13 @@ public class PurchaseInquiryMouldSimpleInfo {
 	@Column(name = DATE_FIELD)
 	private Date date;
 
+	/**
+	 * 截止日期
+	 */
+	@Column(name = ENDDATE_FIELD)
+	private Date endDate;
+
+
 	/**
 	 * 采购企业
 	 */
@@ -133,6 +142,7 @@ public class PurchaseInquiryMouldSimpleInfo {
 	@JoinColumn(name = PRODDETAIL_FIELD, updatable = false, insertable = false)
 	private Set<PurchaseInquiryMouldDetailSimpleInfo> mouldDetails;
 
+
 	public Long getId() {
 		return id;
 	}
@@ -182,7 +192,23 @@ public class PurchaseInquiryMouldSimpleInfo {
 	}
 
 	public Short getOverdue() {
-		return overdue;
+		Date date = new Date();
+		Date endDate = this.getEndDate();
+		Calendar now = Calendar.getInstance();
+		now.setTime(date);
+		now.set(Calendar.HOUR, 0);
+		now.set(Calendar.MINUTE, 0);
+		now.set(Calendar.SECOND, 0);
+		Calendar end = Calendar.getInstance();
+		end.setTime(endDate);
+		end.set(Calendar.HOUR, 0);
+		end.set(Calendar.MINUTE, 0);
+		end.set(Calendar.SECOND, 0);
+		if (now.compareTo(end) < 0) {
+			return 1;
+		} else {
+			return 0;
+		}
 	}
 
 	public void setOverdue(Short overdue) {
@@ -197,6 +223,14 @@ public class PurchaseInquiryMouldSimpleInfo {
 		this.date = date;
 	}
 
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
 	public EnterpriseSimpleInfo getEnterprise() {
 		return enterprise;
 	}
@@ -233,8 +267,8 @@ public class PurchaseInquiryMouldSimpleInfo {
 	public String toString() {
 		return "PurchaseInquiryMouldSimpleInfo [id=" + id + ", code=" + code + ", status=" + status + ", adoptstatus="
 				+ adoptstatus + ", sendstatus=" + sendstatus + ", valid=" + valid + ", overdue=" + overdue + ", date="
-				+ date + ", enterprise=" + enterprise + ", vend=" + vend + ", mouldItems=" + mouldItems
-				+ ", mouldDetails=" + mouldDetails + "]";
+				+ date + ", endDate=" + endDate + ", enterprise=" + enterprise + ", vend=" + vend + ", mouldItems="
+				+ mouldItems + ", mouldDetails=" + mouldDetails + "]";
 	}
 
 	/**

search-console-b2b/src/main/java/com/uas/search/console/b2b/service/impl/SearchServiceImpl.java

@@ -12,6 +12,7 @@ import java.util.Set;
 import org.apache.log4j.Logger;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.NumericRangeQuery;
@@ -19,7 +20,6 @@ import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.BooleanClause.Occur;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -577,40 +577,7 @@ public class DocumentToObjectUtils {
 		return purcReturn;
 	}
 
-	/**
-	 * 将Document转换成PurchaseProofing
-	 * 
-	 * @param document
-	 * @return
-	 */
-	// private static PurchaseProofingSimpleInfo toPurchaseProofing(Document
-	// document) {
-	// if (document == null) {
-	// return null;
-	// }
-	// Table_name tableName =
-	// ClassAndTableNameUtils.toTableName(PurchaseProofingSimpleInfo.class);
-	// PurchaseProofingSimpleInfo purcProofing = new
-	// PurchaseProofingSimpleInfo();
-	// purcProofing.setId(Long.valueOf(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseProofingSimpleInfo.ID_FIELD))));
-	// purcProofing.setCode(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseProofingSimpleInfo.CODE_FIELD)));
-	// purcProofing.setDate(new Date(Long.valueOf(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseProofingSimpleInfo.DATE_FIELD)))));
-	// purcProofing.setVend(JSONObject.parseObject(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseProofingSimpleInfo.VEND_FIELD)),
-	// EnterpriseSimpleInfo.class));
-	// purcProofing.setProofingItems(toSet(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseProofingSimpleInfo.ITEMS_FIELD)),
-	// PurchaseProofingItemSimpleInfo.class));
-	// return purcProofing;
-	// }
+
 
 	/**
 	 * 将Document转换成PurchaseChanges
@@ -985,39 +952,6 @@ public class DocumentToObjectUtils {
 		return purchaseInquiryMould;
 	}
 
-	/**
-	 * 将Document转换成PurchaseInquiry
-	 * 
-	 * @param document
-	 * @return
-	 */
-	// private static PurchaseInquirySimpleInfo toPurchaseInquiry(Document
-	// document) {
-	// if (document == null) {
-	// return null;
-	// }
-	// Table_name tableName =
-	// ClassAndTableNameUtils.toTableName(PurchaseInquirySimpleInfo.class);
-	// PurchaseInquirySimpleInfo purcInquiry = new PurchaseInquirySimpleInfo();
-	// purcInquiry.setId(Long.valueOf(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.ID_FIELD))));
-	// purcInquiry.setCode(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.CODE_FIELD)));
-	// purcInquiry.setDate(new Date(Long.valueOf(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.DATE_FIELD)))));
-	// purcInquiry.setVend(JSONObject.parseObject(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.VEND_FIELD)),
-	// EnterpriseSimpleInfo.class));
-	// purcInquiry.setInquiryItems(toSet(
-	// document.get(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.ITEMS_FIELD)),
-	// PurchaseInquiryItemSimpleInfo.class));
-	// return purcInquiry;
-	// }
 
 	/**
 	 * 将json字符串转为Set<T>对象

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -543,48 +543,7 @@ public class ObjectToDocumentUtils {
 		return document;
 	}
 
-	/**
-	 * PurchaseInquirySimpleInfo对象转为Document
-	 * 
-	 * @param purcInquiry
-	 * @return 转换的Document
-	 */
-	// public static Document toDocument(PurchaseInquirySimpleInfo purcInquiry)
-	// {
-	// if (purcInquiry == null || purcInquiry.getId() == null ||
-	// StringUtils.isEmpty(purcInquiry.getCode())
-	// || purcInquiry.getVend() == null || purcInquiry.getVend().getUu() == null
-	// || StringUtils.isEmpty(purcInquiry.getVend().getEnName())
-	// || StringUtils.isEmpty(purcInquiry.getDate())) {
-	// return null;
-	// }
-	// Table_name tableName =
-	// ClassAndTableNameUtils.toTableName(PurchaseInquirySimpleInfo.class);
-	// Document document = new Document();
-	// // 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
-	// // doc)无法根据id进行更新
-	// document.add(new
-	// StringField(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.ID_FIELD),
-	// String.valueOf(purcInquiry.getId()), Store.YES));
-	// document.add(new TextField(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.CODE_FIELD),
-	// String.valueOf(purcInquiry.getCode()), Store.YES));
-	// document.add(new LongField(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.DATE_FIELD),
-	// purcInquiry.getDate().getTime(), Store.YES));
-	// // vend和items以json的格式存储
-	// document.add(new TextField(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.VEND_FIELD),
-	// JSONObject.toJSONString(purcInquiry.getVend()), Store.YES));
-	// if (!CollectionUtils.isEmpty(purcInquiry.getInquiryItems())) {
-	// document.add(
-	// new TextField(ClassAndTableNameUtils.combineField(tableName,
-	// PurchaseInquirySimpleInfo.ITEMS_FIELD),
-	// JSONObject.toJSONString(purcInquiry.getInquiryItems()), Store.YES));
-	// }
-	// return document;
-	// }
+
 
 	/**
 	 * PurchaseMrbSimpleInfo对象转为Document
@@ -827,15 +786,16 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * 将MakeChangesSimpleInfo转换成Document
+	 * 将MakeOrderChangeItemSimpleInfo转换成Document
 	 * 
-	 * @param makeChanges
+	 * @param makeChangeItems
 	 * @return
 	 */
-	public static Document toDocument(MakeOrderChangeItemSimpleInfo makeChanges) {
-		if (makeChanges == null || makeChanges.getId() == null || StringUtils.isEmpty(makeChanges.getOrderCode())
-				|| makeChanges.getVend() == null || makeChanges.getVend().getUu() == null
-				|| StringUtils.isEmpty(makeChanges.getVend().getEnName())) {
+	public static Document toDocument(MakeOrderChangeItemSimpleInfo makeChangeItems) {
+		if (makeChangeItems == null || makeChangeItems.getId() == null
+				|| StringUtils.isEmpty(makeChangeItems.getOrderCode()) || makeChangeItems.getVend() == null
+				|| makeChangeItems.getVend().getUu() == null
+				|| StringUtils.isEmpty(makeChangeItems.getVend().getEnName())) {
 			return null;
 		}
 		Table_name tableName = ClassAndTableNameUtils.toTableName(MakeOrderChangeItemSimpleInfo.class);
@@ -844,28 +804,28 @@ public class ObjectToDocumentUtils {
 		// doc)无法根据id进行更新
 		document.add(
 				new StringField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.ID_FIELD),
-						String.valueOf(makeChanges.getId()), Store.YES));
+						String.valueOf(makeChangeItems.getId()), Store.YES));
 		document.add(
 				new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.CODE_FIELD),
-						String.valueOf(makeChanges.getOrderCode()), Store.YES));
+						String.valueOf(makeChangeItems.getOrderCode()), Store.YES));
 		// vend和items以json的格式存储
 		document.add(
 				new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.VEND_FIELD),
-						JSONObject.toJSONString(makeChanges.getVend()), Store.YES));
-		if (!StringUtils.isEmpty(makeChanges.getProduct())) {
+						JSONObject.toJSONString(makeChangeItems.getVend()), Store.YES));
+		if (!StringUtils.isEmpty(makeChangeItems.getProduct())) {
 			document.add(new TextField(
 					ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.PRODUCT_FIELD),
-					JSONObject.toJSONString(makeChanges.getProduct()), Store.YES));
+					JSONObject.toJSONString(makeChangeItems.getProduct()), Store.YES));
 		}
-		if (!StringUtils.isEmpty(makeChanges.getMakeChanges())) {
+		if (!StringUtils.isEmpty(makeChangeItems.getMakeChanges())) {
 			document.add(new TextField(
 					ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD),
-					JSONObject.toJSONString(makeChanges.getMakeChanges()), Store.YES));
+					JSONObject.toJSONString(makeChangeItems.getMakeChanges()), Store.YES));
 		}
 		// 排序字段
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.ID_FIELD),
-				makeChanges.getId()));
+				makeChangeItems.getId()));
 		return document;
 	}
 
@@ -1348,6 +1308,7 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryMouldSimpleInfo.OVERDUE_FIELD),
 					String.valueOf(inquiryMould.getOverdue()), Store.YES));
 		}
+
 		if (null != inquiryMould.getValid()) {
 			document.add(new StringField(
 					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryMouldSimpleInfo.VALID_FIELD),