Merge branch 'dev3.4.1' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4.1

fullproject/src_v1/project.go

@@ -790,19 +790,20 @@ func (p *ProjectTask) UpdateProject(tmp map[string]interface{}, thisinfo *Info,
 	} else if thisinfo.TopType == "结果" {
 		if thisinfo.SubType == "中标" || thisinfo.SubType == "成交" || thisinfo.SubType == "流标" || thisinfo.SubType == "废标" {
 			if pInfo.Jgtime > 0 {
-				jg1 := int64(math.Abs(float64(pInfo.Jgtime - thisinfo.Publishtime)))
+				//jg1 := int64(math.Abs(float64(pInfo.Jgtime - thisinfo.Publishtime)))
+				// 4.12	直接更新jgtime
 				//公告状态和项目状态同样都是中标或者成交，
 				if (thisinfo.SubType == "中标" || thisinfo.SubType == "成交") && (pInfo.Bidstatus == "中标" || pInfo.Bidstatus == "成交") {
-					if jg1 > p.jgTime {
+					//if jg1 > p.jgTime {
 						set["jgtime"] = tmp["publishtime"]
 						pInfo.Jgtime = thisinfo.Publishtime
-					}
+					//}
 					//公告状态和项目状态同样是流标或者废标
 				} else if (thisinfo.SubType == "流标" || thisinfo.SubType == "废标") && (pInfo.Bidstatus == "流标" || pInfo.Bidstatus == "废标") {
-					if jg1 > p.jgTime {
+					//if jg1 > p.jgTime {
 						set["jgtime"] = tmp["publishtime"]
 						pInfo.Jgtime = thisinfo.Publishtime
-					}
+					//}
 				}
 			} else {
 				set["jgtime"] = tmp["publishtime"]
@@ -1535,3 +1536,7 @@ func (p *ProjectTask) GetBidTypeAndBidStatus(info *Info) (string, string) {
 	return typeStr, statusStr
 
 }
+
+func ListSort(tmp map[string]interface{}) {
+
+}

udpcreateindex/src/biddingall.go

@@ -240,6 +240,11 @@ func biddingAllTask(data []byte, mapInfo map[string]interface{}) {
 						ent, _ := mgostandard.FindOne("qyxy_historyname", map[string]interface{}{"company_name": w})
 						if len(*ent) > 0 {
 							cid = append(cid, qutil.ObjToString((*ent)["company_id"]))
+						}else {
+							ent, _ = mgostandard.FindOne("qyxy_std", map[string]interface{}{"company_name": w})
+							if len(*ent) > 0 {
+								cid = append(cid, qutil.ObjToString((*ent)["_id"]))
+							}
 						}
 					}
 				}

udpcreateindex/src/biddingindex.go

@@ -270,6 +270,11 @@ func doIndex(infos []map[string]interface{}, eMap map[string]map[string]interfac
 					ent, _ := mgostandard.FindOne("qyxy_historyname", map[string]interface{}{"company_name": w})
 					if len(*ent) > 0 {
 						cid = append(cid, qutil.ObjToString((*ent)["company_id"]))
+					}else {
+						ent, _ = mgostandard.FindOne("qyxy_std", map[string]interface{}{"company_name": w})
+						if len(*ent) > 0 {
+							cid = append(cid, qutil.ObjToString((*ent)["_id"]))
+						}
 					}
 				}
 			}

udpcreateindex/src/config.json

@@ -6,7 +6,7 @@
   "mongodb": {
     "addr": "192.168.3.207:27092",
     "pool": 10,
-    "db": "qfw_data"
+    "db": "wjh"
   },
   "savedb": {
     "addr": "192.168.3.207:27092",
@@ -36,7 +36,7 @@
     "type": "bidding"
   },
   "bidding": {
-    "db": "qfw_data",
+    "db": "wjh",
     "collect": "bidding",
     "index": "bidding",
     "type": "bidding",
@@ -120,7 +120,7 @@
     }
   },
   "elastic": {
-    "addr": "http://192.168.3.128:9800",
+    "addr": "http://192.168.3.11:9800",
     "index": "bidding",
     "itype": "bidding",
     "pool": 12