Parcourir la source

供应商绩效考核

huangct il y a 8 ans
Parent
commit
df24cf711c

+ 6 - 1
search-api-b2b/src/main/java/com/uas/search/b2b/service/SearchService.java

@@ -246,7 +246,12 @@ public interface SearchService {
 		/**
 		 * 招标提问单
 		 */
-		SALE$TENDERQUESTION("SALE$TENDERQUESTION");
+		SALE$TENDERQUESTION("SALE$TENDERQUESTION"),
+
+		/**
+		 * 供应商绩效考核
+		 */
+		VENDORPERFORMANCEASSESS("VENDORPERFORMANCEASSESS");
 		// TODO
 
 		private Table_name(String phrase) {

+ 11 - 0
search-console-b2b/src/main/java/com/uas/search/console/b2b/dao/VendorPerformanceAssessSimpleInfoDao.java

@@ -0,0 +1,11 @@
+package com.uas.search.console.b2b.dao;
+
+import com.uas.search.console.b2b.model.VendorPerformanceAssessSimpleInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * Created by 黄诚天 on 2017-10-13.
+ */
+public interface VendorPerformanceAssessSimpleInfoDao extends JpaRepository<VendorPerformanceAssessSimpleInfo, Long>, JpaSpecificationExecutor<VendorPerformanceAssessSimpleInfo> {
+}

+ 147 - 0
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/VendorPerformanceAssessSimpleInfo.java

@@ -0,0 +1,147 @@
+package com.uas.search.console.b2b.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by 黄诚天 on 2017-10-13.
+ * 供应商绩效考核
+ */
+@Table(name = VendorPerformanceAssessSimpleInfo.TABLE_NAME)
+@Entity
+public class VendorPerformanceAssessSimpleInfo {
+    /**
+     * 表名
+     */
+    public static final String TABLE_NAME = "VENDORPERFORMANCEASSESS";
+
+    /**
+     * 各字段列名(也是存储索引时的field名)
+     */
+    public static final String ID_FIELD = "id";
+
+    public static final String VPAID_FIELD = "vpa_id";
+
+    public static final String CODE_FIELD = "vpa_code";
+
+    public static final String ENTERPRISE_FIELD = "enuu";
+
+    public static final String DATE_FIELD = "vpa_applydate";
+
+    public static final String VPAENUU_FIELD = "vpa_veuu";
+
+    /**
+     * 主键ID
+     */
+    @Id
+    @Column(name = ID_FIELD)
+    private Long id;
+
+    /**
+     *单据ID
+     */
+    @Column(name = VPAID_FIELD)
+    private Long vpaId;
+
+    /**
+     *单据编号
+     */
+    @Column(name = CODE_FIELD)
+    private String vpaCode;
+
+    /**
+     *本企业UU
+     */
+    @Column(name = ENTERPRISE_FIELD)
+    private Long enUU;
+
+    /**
+     * 日期
+     */
+    @Column(name = DATE_FIELD)
+    private Date vpaApplydate;
+
+    /**
+     *供应商企业UU
+     */
+    @Column(name = VPAENUU_FIELD)
+    private Long vpaVeuu;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getVpaId() {
+        return vpaId;
+    }
+
+    public void setVpaId(Long vpaId) {
+        this.vpaId = vpaId;
+    }
+
+    public String getVpaCode() {
+        return vpaCode;
+    }
+
+    public void setVpaCode(String vpaCode) {
+        this.vpaCode = vpaCode;
+    }
+
+    public Long getEnUU() {
+        return enUU;
+    }
+
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
+    }
+
+    public Date getVpaApplydate() {
+        return vpaApplydate;
+    }
+
+    public void setVpaApplydate(Date vpaApplydate) {
+        this.vpaApplydate = vpaApplydate;
+    }
+
+    public Long getVpaVeuu() {
+        return vpaVeuu;
+    }
+
+    public void setVpaVeuu(Long vpaVeuu) {
+        this.vpaVeuu = vpaVeuu;
+    }
+
+    /**
+     * 获取所有可以搜索的字段列名(索引的field名)
+     *
+     * @return 可以搜索的字段列名
+     */
+    public static List<String> getKeywordFields() {
+        List<String> fields = new ArrayList<>();
+        fields.add(CODE_FIELD);
+        fields.add(ENTERPRISE_FIELD);
+        fields.add(VPAENUU_FIELD);
+        return fields;
+    }
+
+    @Override
+    public String toString() {
+        return "VendorPerformanceAssessSimpleInfo{" +
+                "id=" + id +
+                ", vpaId=" + vpaId +
+                ", vpaCode='" + vpaCode + '\'' +
+                ", enUU=" + enUU +
+                ", vpaApplydate=" + vpaApplydate +
+                ", vpaVeuu=" + vpaVeuu +
+                '}';
+    }
+}

+ 14 - 97
search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ClassAndTableNameUtils.java

@@ -1,107 +1,22 @@
 package com.uas.search.console.b2b.util;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.jpa.repository.JpaRepository;
-
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.core.util.ContextUtils;
-import com.uas.search.console.b2b.dao.B2BSaleTenderSimpleInfoDao;
-import com.uas.search.console.b2b.dao.CartSimpleInfoDao;
-import com.uas.search.console.b2b.dao.CustmerSimpleInfoDao;
-import com.uas.search.console.b2b.dao.DeputyOrderSimpleInfoDao;
-import com.uas.search.console.b2b.dao.EnterpriseSearchSimpleInfoDao;
-import com.uas.search.console.b2b.dao.ErpSaleTenderSimpleInfoDao;
-import com.uas.search.console.b2b.dao.InvitationRecordSimpleInfoDao;
-import com.uas.search.console.b2b.dao.KindSimpleInfoDao;
-import com.uas.search.console.b2b.dao.MakeAcceptSimpleInfoDao;
-import com.uas.search.console.b2b.dao.MakeOrderChangeItemSimpleInfoDao;
-import com.uas.search.console.b2b.dao.MakeOrderSimpleInfoDao;
-import com.uas.search.console.b2b.dao.MakeReturnSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PagingReleaseDetailSimpleInfoDao;
-import com.uas.search.console.b2b.dao.ProdNonStandardSimpleInfoDao;
-import com.uas.search.console.b2b.dao.ProdSimpleInfoDao;
-import com.uas.search.console.b2b.dao.ProdStandardSimpleInfoDao;
-import com.uas.search.console.b2b.dao.ProductBrandSimpleInfoDao;
-import com.uas.search.console.b2b.dao.ProductComponentSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurcInquiryItemSimpleInfo2Dao;
-import com.uas.search.console.b2b.dao.PurcInquirySimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurcProofingapprovalSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurcProofingsendSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseAcceptSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseApBillOutSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseApbillSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseApcheckSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseBadinSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseBadoutSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseChangesSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseForecastSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseInquiryItemSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseInquiryMouldSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseMrbSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseNoticeSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseOrderSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseProofingItemSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseReturnSimpleInfoDao;
-import com.uas.search.console.b2b.dao.PurchaseTenderSimpleInfoDao;
-import com.uas.search.console.b2b.dao.SaleArcheckSimpleInfoDao;
-import com.uas.search.console.b2b.dao.SaleQuotationSimpleInfoDao;
-import com.uas.search.console.b2b.dao.SaleSendSimpleInfoDao;
-import com.uas.search.console.b2b.dao.SaleTenderQuestionSimpleInfoDao;
-import com.uas.search.console.b2b.dao.VendorSimpleInfoDao;
-import com.uas.search.console.b2b.model.B2BSaleTenderSimpleInfo;
-import com.uas.search.console.b2b.model.CartSimpleInfo;
-import com.uas.search.console.b2b.model.CustmerSimpleInfo;
-import com.uas.search.console.b2b.model.DeputyOrderSimpleInfo;
-import com.uas.search.console.b2b.model.EnterpriseSearchSimpleInfo;
-import com.uas.search.console.b2b.model.ErpSaleTenderSimpleInfo;
-import com.uas.search.console.b2b.model.InvitationRecordSimpleInfo;
-import com.uas.search.console.b2b.model.KindSimpleInfo;
-import com.uas.search.console.b2b.model.MakeAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.MakeOrderChangeItemSimpleInfo;
-import com.uas.search.console.b2b.model.MakeOrderSimpleInfo;
-import com.uas.search.console.b2b.model.MakeReturnSimpleInfo;
-import com.uas.search.console.b2b.model.PagingReleaseDetailSimpleInfo;
-import com.uas.search.console.b2b.model.ProdNonStandardSimpleInfo;
-import com.uas.search.console.b2b.model.ProdSimpleInfo;
-import com.uas.search.console.b2b.model.ProdStandardSimpleInfo;
-import com.uas.search.console.b2b.model.ProductBrandSimpleInfo;
-import com.uas.search.console.b2b.model.ProductComponentSimpleInfo;
-import com.uas.search.console.b2b.model.PurcInquiryItemSimpleInfo2;
-import com.uas.search.console.b2b.model.PurcInquirySimpleInfo;
-import com.uas.search.console.b2b.model.PurcProofingapprovalSimpleInfo;
-import com.uas.search.console.b2b.model.PurcProofingsendSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApBillOutSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApCheckSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApbillSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadinSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadoutSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseChangesSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseForecastSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryMouldSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseMrbSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseNoticeSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseOrderSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseProofingItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseReturnSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseTenderSimpleInfo;
-import com.uas.search.console.b2b.model.SaleArcheckSimpleInfo;
-import com.uas.search.console.b2b.model.SaleQuotationSimpleInfo;
-import com.uas.search.console.b2b.model.SaleSendSimpleInfo;
-import com.uas.search.console.b2b.model.SaleTenderQuestionSimpleInfo;
-import com.uas.search.console.b2b.model.VendorSimpleInfo;
+import com.uas.search.console.b2b.dao.*;
+import com.uas.search.console.b2b.model.*;
 import com.uas.search.console.b2b.platformmanager.dao.UserSpaceDetailSimpleInfoDao;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -170,6 +85,7 @@ public class ClassAndTableNameUtils {
 		entityClasses.add(B2BSaleTenderSimpleInfo.class);
 		entityClasses.add(PurchaseApBillOutSimpleInfo.class);
 		entityClasses.add(SaleTenderQuestionSimpleInfo.class);
+		entityClasses.add(VendorPerformanceAssessSimpleInfo.class);
 		// TODO 其他表
 
 		// entityClasses和entityDaoClasses对于表的添加顺序必须一致
@@ -218,6 +134,7 @@ public class ClassAndTableNameUtils {
 		entityDaoClasses.add(B2BSaleTenderSimpleInfoDao.class);
 		entityDaoClasses.add(PurchaseApBillOutSimpleInfoDao.class);
 		entityDaoClasses.add(SaleTenderQuestionSimpleInfoDao.class);
+		entityDaoClasses.add(VendorPerformanceAssessSimpleInfoDao.class);
 		// TODO 其他表的Dao
 	}
 

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

@@ -1,88 +1,16 @@
 package com.uas.search.console.b2b.util;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.lucene.document.Document;
-
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
-import com.uas.search.console.b2b.model.B2BSaleTenderItemSimpleInfo;
-import com.uas.search.console.b2b.model.B2BSaleTenderSimpleInfo;
-import com.uas.search.console.b2b.model.BrandSimpleInfo;
-import com.uas.search.console.b2b.model.CartSimpleInfo;
-import com.uas.search.console.b2b.model.CustmerSimpleInfo;
-import com.uas.search.console.b2b.model.DeputyOrderSimpleInfo;
-import com.uas.search.console.b2b.model.EnterpriseSearchSimpleInfo;
-import com.uas.search.console.b2b.model.EnterpriseSimpleInfo;
-import com.uas.search.console.b2b.model.ErpSaleTenderSimpleInfo;
-import com.uas.search.console.b2b.model.InvitationRecordSimpleInfo;
-import com.uas.search.console.b2b.model.KindSimpleInfo;
-import com.uas.search.console.b2b.model.MakeAcceptItemSimpleInfo;
-import com.uas.search.console.b2b.model.MakeAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.MakeChangesSimpleInfo;
-import com.uas.search.console.b2b.model.MakeOrderChangeItemSimpleInfo;
-import com.uas.search.console.b2b.model.MakeOrderSimpleInfo;
-import com.uas.search.console.b2b.model.MakeReturnItemSimpleInfo;
-import com.uas.search.console.b2b.model.MakeReturnSimpleInfo;
-import com.uas.search.console.b2b.model.PagingReleaseDetailSimpleInfo;
-import com.uas.search.console.b2b.model.PagingReleaseSimpleInfo;
-import com.uas.search.console.b2b.model.ProdNonStandardSimpleInfo;
-import com.uas.search.console.b2b.model.ProdSimpleInfo;
-import com.uas.search.console.b2b.model.ProdStandardSimpleInfo;
-import com.uas.search.console.b2b.model.ProductBrandSimpleInfo;
-import com.uas.search.console.b2b.model.ProductComponentSimpleInfo;
-import com.uas.search.console.b2b.model.ProductSimpleInfo;
-import com.uas.search.console.b2b.model.PurcInquiryItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurcInquiryItemSimpleInfo2;
-import com.uas.search.console.b2b.model.PurcInquirySimpleInfo;
-import com.uas.search.console.b2b.model.PurcInquirySimpleInfo2;
-import com.uas.search.console.b2b.model.PurcProofingapprovalSimpleInfo;
-import com.uas.search.console.b2b.model.PurcProofingsendSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseAcceptItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApBillItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApBillOutItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApBillOutSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApCheckItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApCheckSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApbillSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadInItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadinSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadoutItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadoutSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseChangesSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseForecastItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseForecastSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryMouldItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryMouldSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquirySimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseMrbSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseNoticeSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseOrderChangeItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseOrderItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseOrderSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseProofingItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseProofingSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseReturnItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseReturnSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseTenderAnswer;
-import com.uas.search.console.b2b.model.PurchaseTenderProdSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseTenderSimpleInfo;
-import com.uas.search.console.b2b.model.SaleARCheckItemSimpleInfo;
-import com.uas.search.console.b2b.model.SaleArcheckSimpleInfo;
-import com.uas.search.console.b2b.model.SaleQuotationItemSimpleInfo;
-import com.uas.search.console.b2b.model.SaleQuotationSimpleInfo;
-import com.uas.search.console.b2b.model.SaleSendItemSimpleInfo;
-import com.uas.search.console.b2b.model.SaleSendSimpleInfo;
-import com.uas.search.console.b2b.model.SaleTenderQuestionSimpleInfo;
-import com.uas.search.console.b2b.model.UserSimpleInfo;
-import com.uas.search.console.b2b.model.VendorSimpleInfo;
+import com.uas.search.console.b2b.model.*;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
+import org.apache.lucene.document.Document;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * 将Document转换为对象的工具类
@@ -194,6 +122,8 @@ public class DocumentToObjectUtils {
 			return (T) toPurchaseApBillOutSimpleInfo(document);
 		} else if (clazz == SaleTenderQuestionSimpleInfo.class) {
 			return (T) toSaleTenderQuestionSimpleInfo(document);
+		} else if (clazz == VendorPerformanceAssessSimpleInfo.class) {
+			return (T) toVendorPerformanceAssessSimpleInfo(document);
 		}
 
 		// TODO 其他表
@@ -2740,6 +2670,51 @@ public class DocumentToObjectUtils {
 		return purchaseApBillOutSimpleInfo;
 	}
 
+	/**
+	 * 将Document转换成VendorPerformanceAssessSimpleInfo对象
+	 *
+	 * @param document
+	 * @return
+	 */
+	private static VendorPerformanceAssessSimpleInfo toVendorPerformanceAssessSimpleInfo(Document document) {
+		if (document == null) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(VendorPerformanceAssessSimpleInfo.class);
+		VendorPerformanceAssessSimpleInfo vpaSimpleInfo = new VendorPerformanceAssessSimpleInfo();
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.ID_FIELD))) {
+			vpaSimpleInfo.setId(Long.valueOf(
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.ID_FIELD))));
+		}
+
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.VPAID_FIELD))) {
+			vpaSimpleInfo.setVpaId(Long.valueOf(
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.VPAID_FIELD))));
+		}
+
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.CODE_FIELD))) {
+			vpaSimpleInfo.setVpaCode(
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.CODE_FIELD)));
+		}
+
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.ENTERPRISE_FIELD))) {
+			vpaSimpleInfo.setEnUU(Long.valueOf(
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.ENTERPRISE_FIELD))));
+		}
+
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.DATE_FIELD))) {
+			vpaSimpleInfo.setVpaApplydate(new Date(Long.valueOf(
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.DATE_FIELD)))));
+		}
+
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.VPAENUU_FIELD))) {
+			vpaSimpleInfo.setVpaVeuu(Long.valueOf(
+					document.get(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.VPAENUU_FIELD))));
+		}
+
+		return vpaSimpleInfo;
+	}
+
 	/**
 	 * 将json字符串转为Set<T>对象
 	 * 

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

@@ -1,5 +1,6 @@
 package com.uas.search.console.b2b.util;
 
+import com.uas.search.console.b2b.model.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field.Store;
@@ -14,49 +15,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.core.model.Constant;
 import com.uas.search.b2b.service.SearchService.Table_name;
-import com.uas.search.console.b2b.model.B2BSaleTenderSimpleInfo;
-import com.uas.search.console.b2b.model.CartSimpleInfo;
-import com.uas.search.console.b2b.model.CustmerSimpleInfo;
-import com.uas.search.console.b2b.model.DeputyOrderSimpleInfo;
-import com.uas.search.console.b2b.model.EnterpriseSearchSimpleInfo;
-import com.uas.search.console.b2b.model.ErpSaleTenderSimpleInfo;
-import com.uas.search.console.b2b.model.InvitationRecordSimpleInfo;
-import com.uas.search.console.b2b.model.KindSimpleInfo;
-import com.uas.search.console.b2b.model.MakeAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.MakeOrderChangeItemSimpleInfo;
-import com.uas.search.console.b2b.model.MakeOrderSimpleInfo;
-import com.uas.search.console.b2b.model.MakeReturnSimpleInfo;
-import com.uas.search.console.b2b.model.PagingReleaseDetailSimpleInfo;
-import com.uas.search.console.b2b.model.ProdNonStandardSimpleInfo;
-import com.uas.search.console.b2b.model.ProdSimpleInfo;
-import com.uas.search.console.b2b.model.ProdStandardSimpleInfo;
-import com.uas.search.console.b2b.model.ProductBrandSimpleInfo;
-import com.uas.search.console.b2b.model.ProductComponentSimpleInfo;
-import com.uas.search.console.b2b.model.PurcInquiryItemSimpleInfo2;
-import com.uas.search.console.b2b.model.PurcInquirySimpleInfo;
-import com.uas.search.console.b2b.model.PurcProofingapprovalSimpleInfo;
-import com.uas.search.console.b2b.model.PurcProofingsendSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseAcceptSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApBillOutSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApCheckSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseApbillSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadinSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseBadoutSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseChangesSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseForecastSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseInquiryMouldSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseMrbSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseNoticeSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseOrderSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseProofingItemSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseReturnSimpleInfo;
-import com.uas.search.console.b2b.model.PurchaseTenderSimpleInfo;
-import com.uas.search.console.b2b.model.SaleArcheckSimpleInfo;
-import com.uas.search.console.b2b.model.SaleQuotationSimpleInfo;
-import com.uas.search.console.b2b.model.SaleSendSimpleInfo;
-import com.uas.search.console.b2b.model.SaleTenderQuestionSimpleInfo;
-import com.uas.search.console.b2b.model.VendorSimpleInfo;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
 
 import net.sf.ehcache.search.SearchException;
@@ -168,6 +126,8 @@ public class ObjectToDocumentUtils {
 			return toDocument((PurchaseApBillOutSimpleInfo) object);
 		} else if (object instanceof SaleTenderQuestionSimpleInfo) {
 			return toDocument((SaleTenderQuestionSimpleInfo) object);
+		} else if (object instanceof VendorPerformanceAssessSimpleInfo) {
+			return toDocument((VendorPerformanceAssessSimpleInfo) object);
 		}
 		// TODO 其他表
 		else {
@@ -3219,4 +3179,43 @@ public class ObjectToDocumentUtils {
 				purchaseApBillOutSimpleInfo.getRecordDate().getTime()));
 		return document;
 	}
+
+	/**
+	 * 将VendorPerformanceAssessSimpleInfo转换成Document
+	 *
+	 * @param vpaSimpleInfo
+	 * @return
+	 */
+	public static Document toDocument(VendorPerformanceAssessSimpleInfo vpaSimpleInfo) {
+		if (vpaSimpleInfo == null || vpaSimpleInfo.getId() == null || vpaSimpleInfo.getVpaId() == null
+				|| vpaSimpleInfo.getVpaCode() == null || vpaSimpleInfo.getEnUU() == null
+				|| vpaSimpleInfo.getVpaVeuu() == null) {
+			return null;
+		}
+		Table_name tableName = ClassAndTableNameUtils.toTableName(VendorPerformanceAssessSimpleInfo.class);
+		Document document = new Document();
+		// 不能用LongField,否则后续实时更新索引时,方法updateDocument(new Term("", ""),
+		// doc)无法根据id进行更新
+		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.ID_FIELD),
+				String.valueOf(vpaSimpleInfo.getId()), Store.YES));
+		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.VPAID_FIELD),
+				String.valueOf(vpaSimpleInfo.getVpaId()), Store.YES));
+		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.CODE_FIELD),
+				vpaSimpleInfo.getVpaCode(), Store.YES));
+		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.ENTERPRISE_FIELD),
+				String.valueOf(vpaSimpleInfo.getEnUU()), Store.YES));
+		document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.DATE_FIELD),
+				vpaSimpleInfo.getVpaApplydate().getTime(), Store.YES));
+		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.VPAENUU_FIELD),
+				String.valueOf(vpaSimpleInfo.getVpaVeuu()), Store.YES));
+
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.ID_FIELD),
+				vpaSimpleInfo.getId()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, VendorPerformanceAssessSimpleInfo.DATE_FIELD),
+				vpaSimpleInfo.getVpaApplydate().getTime()));
+		return document;
+	}
 }