|
@@ -67,11 +67,13 @@ 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 //含字母
|
|
|
}
|
|
|
+ tmp_nkw = strings.ReplaceAll(tmp_nkw, "(", `\(`)
|
|
|
+ tmp_nkw = strings.ReplaceAll(tmp_nkw, ")", `\)`)
|
|
|
cr.CrVal = regexp.MustCompile(tmp_nkw) //记录reg值
|
|
|
nkw_reg.CReg = append(nkw_reg.CReg, cr)
|
|
|
}
|
|
@@ -85,6 +87,8 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
|
|
|
and = strings.ToUpper(and) //附加词中有英文全部转为大写
|
|
|
ar.IsLetter = true //含字母
|
|
|
}
|
|
|
+ and = strings.ReplaceAll(and, "(", `\(`)
|
|
|
+ and = strings.ReplaceAll(and, ")", `\)`)
|
|
|
ar.CrVal = regexp.MustCompile(and)
|
|
|
arp.AndRegKid = append(arp.AndRegKid, ar)
|
|
|
}
|
|
@@ -119,11 +123,13 @@ 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 //含字母
|
|
|
}
|
|
|
+ tmp_aw = strings.ReplaceAll(tmp_aw, "(", `\(`)
|
|
|
+ tmp_aw = strings.ReplaceAll(tmp_aw, ")", `\)`)
|
|
|
cr.CrVal = regexp.MustCompile(tmp_aw) //记录reg值
|
|
|
aw_reg.CReg = append(aw_reg.CReg, cr)
|
|
|
}
|
|
@@ -137,6 +143,8 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
|
|
|
and = strings.ToUpper(and) //附加词中有英文全部转为大写
|
|
|
ar.IsLetter = true //含字母
|
|
|
}
|
|
|
+ and = strings.ReplaceAll(and, "(", `\(`)
|
|
|
+ and = strings.ReplaceAll(and, ")", `\)`)
|
|
|
ar.CrVal = regexp.MustCompile(and)
|
|
|
arp.AndRegKid = append(arp.AndRegKid, ar)
|
|
|
}
|
|
@@ -172,6 +180,8 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
|
|
|
tmp_kw = strings.ToUpper(tmp_kw)
|
|
|
cr.IsLetter = true //含字母
|
|
|
}
|
|
|
+ tmp_kw = strings.ReplaceAll(tmp_kw, "(", `\(`)
|
|
|
+ tmp_kw = strings.ReplaceAll(tmp_kw, ")", `\)`)
|
|
|
cr.CrVal = regexp.MustCompile(tmp_kw) //记录reg值
|
|
|
kw_reg.CReg = append(kw_reg.CReg, cr)
|
|
|
}
|
|
@@ -185,6 +195,8 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
|
|
|
and = strings.ToUpper(and) //附加词中有英文全部转为大写
|
|
|
ar.IsLetter = true //含字母
|
|
|
}
|
|
|
+ and = strings.ReplaceAll(and, "(", `\(`)
|
|
|
+ and = strings.ReplaceAll(and, ")", `\)`)
|
|
|
ar.CrVal = regexp.MustCompile(and)
|
|
|
arp.AndRegKid = append(arp.AndRegKid, ar)
|
|
|
}
|
|
@@ -1410,7 +1422,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["buyer_type"]) //采购单位类别---私有标签tagname
|
|
|
- if v["bidamount"] != nil { //中标金额
|
|
|
+ if v["bidamount"] != nil { //中标金额
|
|
|
row.AddCell().SetFloat(qu.Float64All(v["bidamount"]))
|
|
|
} else {
|
|
|
row.AddCell()
|