wip:发布平台

jyBXCore/rpc/model/es/es.go

@@ -46,7 +46,7 @@ const (
 	PurchaseIndex             = "bidding_yg"
 	PurchaseBaseField         = `"_id","source_id","title","area","city","district","buyerclass","publishtime","isValidFile","budget","bidamount","signendtime","deliver_area","deliver_city","deliver_district","buyer","buyertel","s_subscopeclass","public_type","purchasing","spidercode","subtype"` //"purchasinglist","projectname",
 	PurchaseSearchSort        = `{"publishtime":-1}`
-	PurchaseBaseFieldForPayer = PurchaseBaseField + `,"buyerperson","agency","agencytel","agencyperson","s_winner","winnertel","winnerperson","signendtime","bidendtime","projectinfo","entidlist"`
+	PurchaseBaseFieldForPayer = PurchaseBaseField + `,"buyerperson","agency","agencytel","agencyperson","s_winner","winnertel","winnerperson","bidendtime","projectinfo","entidlist"`
 )
 
 var (
@@ -60,6 +60,10 @@ var (
 		"拟建项目":   "拟建",
 		"采购意向":   "采购意向",
 	}
+	PurchasePublicType = []string{
+		"用户发布",
+		"平台发布",
+	}
 )
 
 type SearchByES struct {

jyBXCore/rpc/service/purchase.go

@@ -405,7 +405,7 @@ func (p *Purchase) PurchaseQuery() (query string) {
 	}
 	//发布方式
 	if p.Publisher > 0 {
-		must = append(must, fmt.Sprintf(es.QueryBoolMustTerm, "public_type", fmt.Sprintf("%d", p.Publisher)))
+		must = append(must, fmt.Sprintf(es.QueryBoolMustTerm, "public_type", es.PurchasePublicType[p.Publisher-1]))
 	}
 	//截止时间
 	if p.DeadlineStart > 0 || p.DeadlineEnd > 0 {
@@ -687,6 +687,10 @@ func (p *Purchase) FilterCriteriaFormat() {
 			p.DeadlineEnd = time.Now().Unix()
 		}
 	}
+	//发布平台
+	if p.Publisher < 0 || p.Publisher > int64(len(es.PurchasePublicType)) {
+		p.Publisher = 0
+	}
 	//空搜索 其它筛选条件 无效
 	if p.IsEmptySearch() {
 		//