winner、winner_id为空不再进es

data_project_wy/history.go

@@ -256,7 +256,7 @@ func HisTransactionDataFromProject() {
 func HisTransactionDataAddInformation() {
 	sess := MgoPro.GetMgoConn()
 	defer MgoPro.DestoryMongoConn(sess)
-	ch := make(chan bool, 15)
+	ch := make(chan bool, 20)
 	wg := &sync.WaitGroup{}
 	lock := &sync.Mutex{}
 	query := map[string]interface{}{
@@ -272,9 +272,12 @@ func HisTransactionDataAddInformation() {
 		//	"$lte": mongodb.StringTOBsonId("6627227819c5408c474c3802"),
 		//},
 		//采购意向
-		"project_bidstatus": 3,
-		"_id": map[string]interface{}{
-			"$lte": mongodb.StringTOBsonId("661f798b5a4e6cc01349dad0"),
+		//"project_bidstatus": 3,
+		//"_id": map[string]interface{}{
+		//	"$lte": mongodb.StringTOBsonId("661f798b5a4e6cc01349dad0"),
+		//},
+		"project_id": map[string]interface{}{
+			"$lte": "662143800000000000000000",
 		},
 	}
 	count := MgoPro.Count("projectset_wy", query)
@@ -306,42 +309,43 @@ func HisTransactionDataAddInformation() {
 			tmp["agency_id"] = agency_id
 			tmp["winner_id"] = winner_ids
 
-			//项目信息补充业态
-			//if from := gconv.String(tmp["from"]); from == "project" {
-			//	project_id := gconv.String(tmp["project_id"])
-			//	pro, _ := MgoPro.FindById("projectset_20230904", project_id, map[string]interface{}{"property_form": 1})
-			//	if len(*pro) > 0 && (*pro)["property_form"] != nil {
-			//		//更新
-			//		set["property_form"] = (*pro)["property_form"]
-			//		//保存
-			//		tmp["property_form"] = (*pro)["property_form"]
-			//	}
-			//	//查询情报信息
-			//	ids := gconv.Strings(tmp["info_ids"])
-			//	info := FindInfomationData(ids...) //情报信息查询
-			//	//更新
-			//	set["information_id"] = info.Id
-			//	set["starttime"] = info.Starttime
-			//	set["endtime"] = info.Endtime
-			//	//保存
-			//	tmp["information_id"] = info.Id
-			//	tmp["starttime"] = info.Starttime
-			//	tmp["endtime"] = info.Endtime
-			//} else {
-			//	if project_bidstatus := gconv.Int(tmp["project_bidstatus"]); project_bidstatus == 4 { //拟建新增项目，补充情报信息
-			//		//查询情报信息
-			//		id := gconv.String(tmp["info_id"])
-			//		info := FindInfomationData(id) //情报信息查询
-			//		//更新
-			//		set["information_id"] = info.Id
-			//		set["starttime"] = info.Starttime
-			//		set["endtime"] = info.Endtime
-			//		//保存
-			//		//tmp["information_id"] = info.Id
-			//		//tmp["starttime"] = info.Starttime
-			//		//tmp["endtime"] = info.Endtime
-			//	}
-			//}
+			if from := gconv.String(tmp["from"]); from == "project" {
+				//项目信息补充业态
+				project_id := gconv.String(tmp["project_id"])
+				pro, _ := MgoPro.FindById("projectset_20230904", project_id, map[string]interface{}{"property_form": 1})
+				if len(*pro) > 0 && (*pro)["property_form"] != nil {
+					//更新
+					set["property_form"] = (*pro)["property_form"]
+					//保存
+					tmp["property_form"] = (*pro)["property_form"]
+				}
+
+				//查询情报信息
+				ids := gconv.Strings(tmp["info_ids"])
+				info := FindInfomationData(ids...) //情报信息查询
+				//更新
+				set["information_id"] = info.Id
+				set["starttime"] = info.Starttime
+				set["endtime"] = info.Endtime
+				//保存
+				tmp["information_id"] = info.Id
+				tmp["starttime"] = info.Starttime
+				tmp["endtime"] = info.Endtime
+			} else {
+				if project_bidstatus := gconv.Int(tmp["project_bidstatus"]); project_bidstatus == 4 { //拟建新增项目，补充情报信息
+					//查询情报信息
+					id := gconv.String(tmp["info_id"])
+					info := FindInfomationData(id) //情报信息查询
+					//更新
+					set["information_id"] = info.Id
+					set["starttime"] = info.Starttime
+					set["endtime"] = info.Endtime
+					//保存
+					tmp["information_id"] = info.Id
+					tmp["starttime"] = info.Starttime
+					tmp["endtime"] = info.Endtime
+				}
+			}
 			delete(tmp, "from")     //无用字段删除
 			delete(tmp, "_id")      //无用字段删除
 			if !SaveDataToEs(tmp) { //保存、更新es

data_project_wy/main.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/robfig/cron"
-	"strings"
 	"sync"
 )
 
@@ -57,11 +56,11 @@ func tmp() {
 				<-ch
 				wg.Done()
 			}()
-			info_id := gconv.String(tmp["info_id"])
-			data, _ := MgoB.FindById("bidding", info_id, map[string]interface{}{"s_topscopeclass": 1})
-			s_topscopeclass := gconv.String((*data)["s_topscopeclass"])
-			if !strings.Contains(s_topscopeclass, "建筑工程") {
-				MgoPro.Del("projectset_wy", map[string]interface{}{"_id": tmp["_id"]})
+			project_id := gconv.String(tmp["project_id"])
+			count := MgoPro.Count("projectset_wy_back", map[string]interface{}{"project_id": project_id})
+			if count > 0 {
+				fmt.Println(project_id)
+				MgoPro.Del("projectset_wy_back", map[string]interface{}{"project_id": tmp["project_id"]})
 			}
 			//update := []map[string]interface{}{
 			//	{"_id": tmp["_id"]},

data_project_wy/task.go

@@ -618,6 +618,10 @@ func SaveDataToEs(data map[string]interface{}) bool {
 	for k, v := range data {
 		if k == "project_id" {
 			k = "_id"
+		} else if k == "winner" || k == "winner_id" { //winner和winner_id无值不进es
+			if len(gconv.Strings(v)) == 0 {
+				continue
+			}
 		}
 		tmp[k] = v
 	}