Browse Source

date字段添加判断

dongbw 9 năm trước cách đây
mục cha
commit
08b09fc5e3

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

@@ -182,7 +182,6 @@ public class ObjectToDocumentUtils {
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ID_FIELD),
 				purchaseOrder.getId()));
-
 		return document;
 	}
 
@@ -278,9 +277,11 @@ public class ObjectToDocumentUtils {
 							JSONObject.toJSONString(purcAccept.getAcceptItems()), Store.YES));
 		}
 		// 排序字段
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.DATE_FIELD),
-				purcAccept.getDate().getTime()));
+		if (!StringUtils.isEmpty(purcAccept.getDate())) {
+			document.add(new NumericDocValuesField(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.DATE_FIELD),
+					purcAccept.getDate().getTime()));
+		}
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.ID_FIELD), purcAccept.getId()));
 		return document;
@@ -424,9 +425,11 @@ public class ObjectToDocumentUtils {
 							JSONObject.toJSONString(purchBadin.getBadInItems()), Store.YES));
 		}
 		// 排序字段
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseBadinSimpleInfo.DATE_FIELD),
-				purchBadin.getDate().getTime()));
+		if (!StringUtils.isEmpty(purchBadin.getDate())) {
+			document.add(new NumericDocValuesField(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseBadinSimpleInfo.DATE_FIELD),
+					purchBadin.getDate().getTime()));
+		}
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurchaseBadinSimpleInfo.ID_FIELD), purchBadin.getId()));
 		return document;
@@ -476,9 +479,11 @@ public class ObjectToDocumentUtils {
 							JSONObject.toJSONString(purchaseBadout.getBadOutItems()), Store.YES));
 		}
 		// 排序字段
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseBadoutSimpleInfo.DATE_FIELD),
-				purchaseBadout.getDate().getTime()));
+		if (!StringUtils.isEmpty(purchaseBadout.getDate())) {
+			document.add(new NumericDocValuesField(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseBadoutSimpleInfo.DATE_FIELD),
+					purchaseBadout.getDate().getTime()));
+		}
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurchaseBadoutSimpleInfo.ID_FIELD),
 				purchaseBadout.getId()));
@@ -757,9 +762,11 @@ public class ObjectToDocumentUtils {
 							JSONObject.toJSONString(purcReturn.getReturnItems()), Store.YES));
 		}
 		// 排序字段
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseReturnSimpleInfo.DATE_FIELD),
-				purcReturn.getDate().getTime()));
+		if (!StringUtils.isEmpty(purcReturn.getDate())) {
+			document.add(new NumericDocValuesField(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseReturnSimpleInfo.DATE_FIELD),
+					purcReturn.getDate().getTime()));
+		}
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurchaseReturnSimpleInfo.ID_FIELD), purcReturn.getId()));
 		return document;
@@ -941,9 +948,11 @@ public class ObjectToDocumentUtils {
 					JSONObject.toJSONString(saleSend.getSendItems()), Store.YES));
 		}
 		// 排序字段
-		document.add(
-				new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.DATE_FIELD),
-						saleSend.getDate().getTime()));
+		if (!StringUtils.isEmpty(saleSend.getDate())) {
+			document.add(new NumericDocValuesField(
+					ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.DATE_FIELD),
+					saleSend.getDate().getTime()));
+		}
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.ID_FIELD), saleSend.getId()));
 		return document;
@@ -1071,9 +1080,11 @@ public class ObjectToDocumentUtils {
 				ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.ENTERPRISE_FIELD),
 				JSON.toJSONString(purcProofingapproval.getEnterprise().getEnName()), Store.YES));
 		// 排序字段
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.DATE_FIELD),
-				purcProofingapproval.getDate().getTime()));
+		if (!StringUtils.isEmpty(purcProofingapproval.getDate())) {
+			document.add(new NumericDocValuesField(
+					ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.DATE_FIELD),
+					purcProofingapproval.getDate().getTime()));
+		}
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.ID_FIELD),
 				purcProofingapproval.getId()));
@@ -1119,9 +1130,11 @@ public class ObjectToDocumentUtils {
 					JSONObject.toJSONString(purcProofingsend.getProofingItem()), Store.YES));
 		}
 		// 排序字段
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurcProofingsendSimpleInfo.DATE_FIELD),
-				purcProofingsend.getDate().getTime()));
+		if (!StringUtils.isEmpty(purcProofingsend.getDate())) {
+			document.add(new NumericDocValuesField(
+					ClassAndTableNameUtils.combineField(tableName, PurcProofingsendSimpleInfo.DATE_FIELD),
+					purcProofingsend.getDate().getTime()));
+		}
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurcProofingsendSimpleInfo.ID_FIELD),
 				purcProofingsend.getId()));