修改purchaseTender的相关方法。 定时任务加入purchaseTender

search-console-b2b/src/main/java/com/uas/search/console/b2b/Application.java

@@ -12,6 +12,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import com.uas.search.console.b2b.core.util.ContextUtils;
 import com.uas.search.console.b2b.model.PurchaseInquiryItemSimpleInfo;
 import com.uas.search.console.b2b.model.PurchaseInquiryMouldSimpleInfo;
+import com.uas.search.console.b2b.model.PurchaseTenderSimpleInfo;
 import com.uas.search.console.b2b.schedule.service.TaskService;
 import com.uas.search.console.b2b.service.RealTimeUpdateMonitorService;
 import com.uas.search.console.b2b.service.UpdateVirtualColumnService;
@@ -49,6 +50,11 @@ public class Application {
 					systemProperties.getDailyTaskHour(), systemProperties.getDailyTaskMinute(),
 					systemProperties.getDailyTaskSecond());
 
+			// 定时更新招标单虚拟列索引
+			fields.put("result", Short.class);
+			updateVirtualColumnService.newDailyTask(PurchaseTenderSimpleInfo.class, fields,
+					systemProperties.getDailyTaskHour(), systemProperties.getDailyTaskMinute(),
+					systemProperties.getDailyTaskSecond());
 			// 定时监控实时更新异常情况
 			RealTimeUpdateMonitorService realTimeUpdateMonitorService = ContextUtils
 					.getBean(RealTimeUpdateMonitorService.class);

search-console-b2b/src/main/java/com/uas/search/console/b2b/controller/ScheduleController.java

@@ -35,7 +35,7 @@ public class ScheduleController {
 			@RequestParam(required = true) String fields, @RequestParam(required = true) Integer hour,
 			@RequestParam(required = true) Integer minute, @RequestParam(required = true) Integer second) throws ClassNotFoundException {
 		Table_name table = Table_name.valueOf(tableName.toUpperCase());
-		if (table != Table_name.PURC$INQUIRYMOULD && table != Table_name.PURC$INQUIRYITEMS) {
+		if (table != Table_name.PURC$INQUIRYMOULD && table != Table_name.PURC$INQUIRYITEMS && table != Table_name.PURC$TENDER) {
 			return "不支持更新虚拟列overdue索引：" + tableName;
 		}
 		Map<String, Class<?>> map = new HashMap<>();

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

@@ -53,6 +53,12 @@ public class PurchaseTenderItemSimpleInfo {
 	@Column(name = "pti_applystatus")
 	private String applyStatus;
 	
+	/**
+	 * 投标状态
+	 */
+	@Column(name = "pti_status")
+	private String status;
+	
 	/**
 	 * 供应商信息
 	 */
@@ -104,6 +110,18 @@ public class PurchaseTenderItemSimpleInfo {
 	public String getApplyStatus() {
 		return applyStatus;
 	}
+	
+	
+
+
+	public String getStatus() {
+		return status;
+	}
+
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
 
 
 	public void setApplyStatus(String applyStatus) {

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

@@ -73,6 +73,10 @@ public class PurchaseTenderSimpleInfo {
 
 	public static final String ITEMS_FIELD = "pti_ptid";
 	
+	public static final String OVERDUE_FIELD = "pt_overdue"; // 过了投标截止日期为1 ，未过是0
+	
+	public static final String RESULT_FIELD = "pt_result"; // 过了公布结果日期为1， 未过是0
+	
 	@Id
 	@Column(name = ID_FIELD)
 	private Long id;
@@ -187,6 +191,15 @@ public class PurchaseTenderSimpleInfo {
 	@JoinColumn(name = ITEMS_FIELD, updatable = false, insertable = false)
 	private Set<PurchaseTenderItemSimpleInfo> tenderItems;
 
+	/**
+	 * 是否截止投标
+	 */
+	private Short pt_overdue;
+	
+	/**
+	 * 是否公布结果
+	 */
+	private Short pt_result;
 
 	public Long getId() {
 		return id;
@@ -341,6 +354,55 @@ public class PurchaseTenderSimpleInfo {
 		this.tenderItems = tenderItems;
 	}
 
+	@SuppressWarnings("deprecation")
+	public Short getOverdue() {
+		if (endDate == null) {
+			return null;
+		}
+		Date date = new Date();
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.YEAR, date.getYear());
+		now.set(Calendar.MONTH, date.getMonth());
+		now.set(Calendar.DAY_OF_MONTH, date.getDate());
+		Calendar end = Calendar.getInstance();
+		end.set(Calendar.YEAR, endDate.getYear());
+		end.set(Calendar.MONTH, endDate.getMonth());
+		end.set(Calendar.DAY_OF_MONTH, endDate.getDate());
+		if (now.compareTo(end) > 0) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	public void setOverdue(Short overdue) {
+		this.pt_overdue = overdue;
+	}
+	
+	@SuppressWarnings("deprecation")
+	public Short getResult() {
+		if (publishDate == null) {
+			return null;
+		}
+		Date date = new Date();
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.YEAR, date.getYear());
+		now.set(Calendar.MONTH, date.getMonth());
+		now.set(Calendar.DAY_OF_MONTH, date.getDate());
+		Calendar end = Calendar.getInstance();
+		end.set(Calendar.YEAR, publishDate.getYear());
+		end.set(Calendar.MONTH, publishDate.getMonth());
+		end.set(Calendar.DAY_OF_MONTH, publishDate.getDate());
+		if (now.compareTo(end) > 0) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	public void setResult(Short overdue) {
+		this.pt_overdue = overdue;
+	}
 
 	@Override
 	public String toString() {

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

@@ -8,6 +8,7 @@ import org.apache.lucene.document.Document;
 
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.sun.mail.handlers.text_html;
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.model.BrandSimpleInfo;
@@ -1283,22 +1284,22 @@ public class DocumentToObjectUtils {
 		}
 		String status = document.get(ClassAndTableNameUtils.combineField(tableName,
 				PurchaseTenderSimpleInfo.STATUS_FIELD));
-		if (title != null) {
+		if (status != null) {
 			purchasetender.setStatus(status);
 		}
 		String date = document.get(ClassAndTableNameUtils.combineField(tableName,
 				PurchaseTenderSimpleInfo.DATE_FIELD));
-		if (title != null) {
+		if (date != null) {
 			purchasetender.setDate(new Date(Long.valueOf(date)));
 		}
 		String endDate = document.get(ClassAndTableNameUtils.combineField(tableName,
 				PurchaseTenderSimpleInfo.ENDDATE_FIELD));
-		if (title != null) {
+		if (endDate != null) {
 			purchasetender.setEndDate(new Date(Long.valueOf(endDate)));
 		}
 		String publishDate = document.get(ClassAndTableNameUtils.combineField(tableName,
 				PurchaseTenderSimpleInfo.PUBLISHDATE_FIELD));
-		if (title != null) {
+		if (publishDate != null) {
 			purchasetender.setPublishDate(new Date(Long.valueOf(publishDate)));
 		}
 		String payment = document.get(ClassAndTableNameUtils.combineField(tableName,
@@ -1338,7 +1339,7 @@ public class DocumentToObjectUtils {
 		}
 		String certificate = document.get(ClassAndTableNameUtils.combineField(tableName,
 				PurchaseTenderSimpleInfo.CERTIFICATE_FIELD));
-		if (prodCode != null) {
+		if (certificate != null) {
 			purchasetender.setCertificate(certificate);
 		}
 		String isPublish = document.get(ClassAndTableNameUtils.combineField(tableName,
@@ -1349,7 +1350,7 @@ public class DocumentToObjectUtils {
 		String ifOpen = document.get(ClassAndTableNameUtils.combineField(tableName,
 				PurchaseTenderSimpleInfo.IFOPEN_FIELD));
 		if (ifOpen != null) {
-			purchasetender.setIsPublish(Short.valueOf(ifOpen));
+			purchasetender.setIfOpen(Short.valueOf(ifOpen));
 		}
 		purchasetender
 				.setEnterprise(
@@ -1365,6 +1366,18 @@ public class DocumentToObjectUtils {
 							ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.ITEMS_FIELD)),
 					PurchaseTenderItemSimpleInfo.class));
 		}
+		String overdue = document.get(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.OVERDUE_FIELD));
+		if (overdue != null) {
+			purchasetender.setOverdue(Short.valueOf(document.get(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.OVERDUE_FIELD))));
+		}
+		String result = document.get(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.RESULT_FIELD));
+		if (result != null) {
+			purchasetender.setResult(Short.valueOf(document.get(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.RESULT_FIELD))));
+		}
 		return purchasetender;
 	}
 

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

@@ -1649,6 +1649,16 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.ITEMS_FIELD),
 					JSONObject.toJSONString(tender.getTenderItems()), Store.YES));
 		}
+		if (null != tender.getOverdue()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.OVERDUE_FIELD),
+					String.valueOf(tender.getOverdue()), Store.YES));
+		}
+		if (null != tender.getResult()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseTenderSimpleInfo.RESULT_FIELD),
+					String.valueOf(tender.getResult()), Store.YES));
+		}
 		
 		// 排序字段
 		document.add(new NumericDocValuesField(