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

src/config.json

@@ -3,7 +3,7 @@
     "mgodb": "192.168.3.207:27092",
     "dbsize": 10,
     "dbname": "extract_dev32",
-    "redis": "buyer=127.0.0.1:6379,winner=127.0.0.1:6379,agency=127.0.0.1:6379",
+    "redis": "buyer=192.168.3.205:6379,winner=192.168.3.205:6379,agency=192.168.3.205:6379",
     "elasticsearch": "http://127.0.0.1:9800",
     "elasticsearch_index": "winner_enterprise",
     "elasticsearch_type": "winnerent",

src/jy/pretreated/analytable.go

@@ -244,6 +244,13 @@ func (table *Table) KVFilter(isSite bool, codeSite string) {
 			MergeKvTags(table.StandKV, kvTags)
 		} else {
 			//u.Debug(k, v, "---------")
+			if strings.Contains(k,"总价"){
+				if vvvv,ok := v.([]string);ok && len(vvvv)>0{
+					as.RemoveKey("报价")
+					as.AddKey(k,vvvv[len(vvvv)-1])
+					continue
+				}
+			}
 			as.AddKey(k, v)
 		}
 	}
@@ -470,7 +477,17 @@ func (table *Table) sortKVArr(as *SortMap, isSite bool, codeSite string) {
 							tmp.Weight = vv[0].Weight
 							tmp.Key = vv[0].Key
 							tmp.IsInvalid = vv[0].IsInvalid
-							tmp.Value = vvvvvv
+							if kk == "单品报价"||kk == "中标金额"||kk == "预算"{
+								if strings.Contains(k,"万"){
+									tmp.Value = vvvvvv+"万"
+								}else if strings.Contains(k,"亿"){
+									tmp.Value = vvvvvv+"亿"
+								}else {
+									tmp.Value = vvvvvv
+								}
+							}else {
+								tmp.Value = vvvvvv
+							}
 							table.StandKV[kk] = append(table.StandKV[kk], &tmp)
 						}
 					}

src/jy/pretreated/tablev2.go

@@ -219,6 +219,9 @@ func (td *TD) tdHasTable(bsontable *bool, tr *TR,isSite bool,codeSite string) {
 				stag = str
 			}
 		}
+		if strings.Contains(stag,"开标记录"){
+			return
+		}
 		for _, tv := range tabs {
 			if IsHide(tv) {
 				continue