xiugai

customerdata/src/util.go

@@ -522,6 +522,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 										s_data[ks] = vks
 									}
 									s_data["s_winner"] = w
+									GetWinnerType(w, s_data)
 									if vs["bidamount"] != nil {
 										s_data["bidamount"] = vs["bidamount"]
 									}
@@ -533,6 +534,8 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 									log.Println("index", index, " ", id, " ", w)
 									log.Println("indexdata", len(indexdata))
 								} else {
+									tmp["s_winner"] = w
+									GetWinnerType(w, tmp)
 									if vs["bidamount"] != nil {
 										tmp["bidamount"] = vs["bidamount"]
 									}
@@ -559,33 +562,6 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 			}
 			if len(indexdata) > 0 {
 				for _, v := range indexdata {
-					s_winner := qu.ObjToString(v["s_winner"])
-					isMatch := false
-					for _, vs := range Sysconfig.DisPackageConfig {
-						vvs := vs.(map[string]interface{})
-						keyWord := qu.ObjToString(vvs["keyWord"])
-						exclued := qu.ObjToString(vvs["exclued"])
-						name := qu.ObjToString(vvs["name"])
-						for _, key := range strings.Split(keyWord, ",") {
-							if strings.Contains(s_winner, key) {
-								isMatch = true
-								if exclued != "" {
-									for _, keys := range strings.Split(exclued, ",") {
-										if strings.Contains(s_winner, keys) {
-											isMatch = false
-										}
-									}
-								}
-							}
-						}
-						if isMatch {
-							v["winner_type"] = name
-							break
-						}
-					}
-					if !isMatch {
-						v["winner_type"] = "集成商"
-					}
 					MgoSaveCache <- v
 				}
 			}
@@ -971,3 +947,32 @@ func Sort_year_report(year_report primitive.A) map[string]interface{} {
 	}
 	return new_year_report.(map[string]interface{})
 }
+
+func GetWinnerType(s_winner string, v map[string]interface{}) {
+	isMatch := false
+	for _, vs := range Sysconfig.DisPackageConfig {
+		vvs := vs.(map[string]interface{})
+		keyWord := qu.ObjToString(vvs["keyWord"])
+		exclued := qu.ObjToString(vvs["exclued"])
+		name := qu.ObjToString(vvs["name"])
+		for _, key := range strings.Split(keyWord, ",") {
+			if strings.Contains(s_winner, key) {
+				isMatch = true
+				if exclued != "" {
+					for _, keys := range strings.Split(exclued, ",") {
+						if strings.Contains(s_winner, keys) {
+							isMatch = false
+						}
+					}
+				}
+			}
+		}
+		if isMatch {
+			v["winner_type"] = name
+			break
+		}
+	}
+	if !isMatch {
+		v["winner_type"] = "集成商"
+	}
+}

src/history/util_history.go

@@ -63,7 +63,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 					tmp_nkw := nkw_addArr[0]
 					if tmp_nkw != "" {
 						cr := &CommonReg{}
-						cr.CsVal = tmp_nkw //记录原值
+						cr.CsVal = tmp_nkw                   //记录原值
 						if LetterCase.MatchString(tmp_nkw) { //判断附加词中是否有英文
 							tmp_nkw = strings.ToUpper(tmp_nkw) //附加词中有英文全部转为大写
 							cr.IsLetter = true                 //含字母
@@ -115,7 +115,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 				tmp_aw := aw_addArr[0]
 				if tmp_aw != "" {
 					cr := &CommonReg{}
-					cr.CsVal = tmp_aw //记录原值
+					cr.CsVal = tmp_aw                   //记录原值
 					if LetterCase.MatchString(tmp_aw) { //判断附加词中是否有英文
 						tmp_aw = strings.ToUpper(tmp_aw) //附加词中有英文全部转为大写
 						cr.IsLetter = true               //含字母
@@ -517,6 +517,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 										s_data[ks] = vks
 									}
 									s_data["s_winner"] = w
+									GetWinnerType(w, s_data)
 									if vs["bidamount"] != nil {
 										s_data["bidamount"] = vs["bidamount"]
 									}
@@ -528,6 +529,8 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 									log.Println("index", index, " ", id, " ", w)
 									log.Println("indexdata", len(indexdata))
 								} else {
+									tmp["s_winner"] = w
+									GetWinnerType(w, tmp)
 									if vs["bidamount"] != nil {
 										tmp["bidamount"] = vs["bidamount"]
 									}
@@ -554,34 +557,6 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 			}
 			if len(indexdata) > 0 {
 				for _, v := range indexdata {
-					s_winner := qu.ObjToString(v["s_winner"])
-					isMatch := false
-					for _, vs := range Sysconfig["dis_package_config"].(map[string]interface{}) {
-						vvs := vs.(map[string]interface{})
-						keyWord := qu.ObjToString(vvs["keyWord"])
-						exclued := qu.ObjToString(vvs["exclued"])
-						name := qu.ObjToString(vvs["name"])
-						for _, key := range strings.Split(keyWord, ",") {
-							if strings.Contains(s_winner, key) {
-								isMatch = true
-								if exclued != "" {
-									for _, keys := range strings.Split(exclued, ",") {
-										if strings.Contains(s_winner, keys) {
-											isMatch = false
-										}
-									}
-								}
-							}
-						}
-						if isMatch {
-							v["winner_type"] = name
-							break
-						}
-					}
-					if !isMatch {
-						v["winner_type"] = "集成商"
-					}
-					log.Println("中标模式", v["winner_type"])
 					MgoSaveCache <- v
 					xlsxArr = append(xlsxArr, v)
 					xlsxCount++
@@ -1155,7 +1130,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 					row.AddCell().SetValue(v["projectname"]) //项目名称
 					row.AddCell().SetValue(v["buyer"])       //采购单位
 					row.AddCell().SetValue(v[""])            //采购单位类别---私有标签tagname
-					if v["bidamount"] != nil { //中标金额
+					if v["bidamount"] != nil {               //中标金额
 						row.AddCell().SetFloat(qu.Float64All(v["bidamount"]))
 					} else {
 						row.AddCell()
@@ -1294,3 +1269,32 @@ func checkBidId(appid, id string) bool {
 	}
 	return isOk
 }
+
+func GetWinnerType(s_winner string, v map[string]interface{}) {
+	isMatch := false
+	for _, vs := range Sysconfig["dis_package_config"].(map[string]interface{}) {
+		vvs := vs.(map[string]interface{})
+		keyWord := qu.ObjToString(vvs["keyWord"])
+		exclued := qu.ObjToString(vvs["exclued"])
+		name := qu.ObjToString(vvs["name"])
+		for _, key := range strings.Split(keyWord, ",") {
+			if strings.Contains(s_winner, key) {
+				isMatch = true
+				if exclued != "" {
+					for _, keys := range strings.Split(exclued, ",") {
+						if strings.Contains(s_winner, keys) {
+							isMatch = false
+						}
+					}
+				}
+			}
+		}
+		if isMatch {
+			v["winner_type"] = name
+			break
+		}
+	}
+	if !isMatch {
+		v["winner_type"] = "集成商"
+	}
+}