|
@@ -35,7 +35,6 @@ type DecParam struct {
|
|
|
}
|
|
|
|
|
|
var regExperts = regexp.MustCompile("^[\\p{Han}]{2,4}$")
|
|
|
-var regWinner = regexp.MustCompile(".+[司院厂所心处普]$")
|
|
|
var decisionLock = map[string]*sync.Mutex{}
|
|
|
|
|
|
//试用用户分析
|
|
@@ -438,7 +437,7 @@ func getDecInfo(decQuery, buyer_buyerClass string, dec *DecParam) map[string]int
|
|
|
if len(aggsMap) > 0 {
|
|
|
var buckets = []*DecWinnerInfo{}
|
|
|
for _, v := range aggsMap {
|
|
|
- if !regWinner.MatchString(qutil.ObjToString(v["key"])) {
|
|
|
+ if !RegWinner.MatchString(qutil.ObjToString(v["key"])) {
|
|
|
continue
|
|
|
}
|
|
|
//类似项目金额
|
|
@@ -578,8 +577,17 @@ func Sequence(seqData []map[string]interface{}) []map[string]interface{} {
|
|
|
var sequenceArr9 = []map[string]interface{}{}
|
|
|
for k, v := range seqData {
|
|
|
var score = 0
|
|
|
- if v["s_winner"] == nil || !regWinner.MatchString(qutil.ObjToString(v["s_winner"].(string))) {
|
|
|
- continue
|
|
|
+ if v["s_winner"] == nil {
|
|
|
+ var s_winner = qutil.ObjToString(v["s_winner"])
|
|
|
+ var s_length = 0
|
|
|
+ for _, v := range strings.Split(s_winner, ",") {
|
|
|
+ if RegWinner.MatchString(v) {
|
|
|
+ s_length += 1
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if s_length == 0 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
}
|
|
|
//评审专家
|
|
|
review_experts := []string{}
|