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

src/jy/clear/tonumber.go

@@ -399,7 +399,8 @@ func ClearMaxAmount(data []interface{}, spidercode ...string) []interface{} {
 	}
 	if value >= 500000000000 {
 		data[0] = float64(0)
-		data[1] = false
+		//data[1] = false
+		data[1] = true
 	}
 	return data
 }

src/jy/extract/extract.go

@@ -2090,13 +2090,7 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
 			}
 		}
 		tmp["dataging"] = j.Dataging
-		//budget bidamount
-		if bg, ok := tmp["budget"].(float64); ok && bg >= 500000000000 {
-			delete(tmp, "budget")
-		}
-		if bg, ok := tmp["bidamount"].(float64); ok && bg >= 500000000000 {
-			delete(tmp, "bidamount")
-		}
+
 		//检查字段
 		tmp = checkFields(tmp)
 		if tmp["projectname"] == nil || tmp["projectname"] == "" {
@@ -2213,6 +2207,15 @@ func checkFields(tmp map[string]interface{}) map[string]interface{} {
 			tmp["s_winner"] = strwin
 		}
 	}
+	//budget bidamount
+	if bg, ok := tmp["budget"].(float64); ok && bg >= 500000000000 {
+		tmp["big_budget_err"] = bg
+		delete(tmp, "budget")
+	}
+	if bg, ok := tmp["bidamount"].(float64); ok && bg >= 500000000000 {
+		tmp["big_bidamount_err"] = bg
+		delete(tmp, "bidamount")
+	}
 	return tmp
 }
 

src/jy/extract/extractInit.go

@@ -1211,18 +1211,18 @@ func (e *ExtractTask) initDistricts(jc_province string, qc_city string, c *City,
 				e.NewStreetDistrictMap[strvtown] = append(e.NewStreetDistrictMap[strvtown], d)
 			}
 			//村、居委会
-			jwhs := jwhs_maps[jc_province][qc_city][qc_district][strvtown]
-			for _, vjwh := range jwhs {
-				strvillage := qu.ObjToString(vjwh["village"])
-				e.Trie_Full_Community.AddWords(strvillage) //加入居委会、村全称Trie
-				cttmp := e.CommunityDistrictMap[strvillage]
-				if len(cttmp) == 0 {
-					tmpdarr := []*District{d}
-					e.CommunityDistrictMap[strvillage] = tmpdarr
-				} else {
-					e.CommunityDistrictMap[strvillage] = append(e.CommunityDistrictMap[strvillage], d)
-				}
-			}
+			// jwhs := jwhs_maps[jc_province][qc_city][qc_district][strvtown]
+			// for _, vjwh := range jwhs {
+			// 	strvillage := qu.ObjToString(vjwh["village"])
+			// 	e.Trie_Full_Community.AddWords(strvillage) //加入居委会、村全称Trie
+			// 	cttmp := e.CommunityDistrictMap[strvillage]
+			// 	if len(cttmp) == 0 {
+			// 		tmpdarr := []*District{d}
+			// 		e.CommunityDistrictMap[strvillage] = tmpdarr
+			// 	} else {
+			// 		e.CommunityDistrictMap[strvillage] = append(e.CommunityDistrictMap[strvillage], d)
+			// 	}
+			// }
 		}
 
 	}