|
|
@@ -65,7 +65,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 //含字母
|
|
|
@@ -117,7 +117,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 //含字母
|
|
|
@@ -1035,6 +1035,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
|
|
|
row.AddCell().SetValue(v["departname"])
|
|
|
row.AddCell().SetValue(v["rulename"])
|
|
|
row.AddCell().SetValue(v["matchkey"])
|
|
|
+ row.AddCell().SetValue(v["toptype"])
|
|
|
row.AddCell().SetValue(v["area"])
|
|
|
row.AddCell().SetValue(v["city"])
|
|
|
row.AddCell().SetValue(v["district"])
|
|
|
@@ -1141,7 +1142,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()
|
|
|
@@ -1180,7 +1181,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
|
|
|
ids := SE.EncodeString(qu.ObjToString(v["id"])) //唯一标识
|
|
|
row.AddCell().SetValue(ids)
|
|
|
row.AddCell().SetValue(v["projectId"]) //项目标识
|
|
|
- row.AddCell().SetValue(v["jybxhref"]) //剑鱼标讯地址
|
|
|
+ row.AddCell().SetValue(v["jybxhref"]) //剑鱼标讯地址
|
|
|
|
|
|
//row.AddCell().SetValue(v["projectcode"])
|
|
|
}
|
|
|
@@ -1309,7 +1310,7 @@ func GetWinnerType(s_winner string, v map[string]interface{}) {
|
|
|
//v["winner_type"] = name
|
|
|
break
|
|
|
} else {
|
|
|
- if j == len(Sysconfig["dis_package_config"].(map[string]interface{})){
|
|
|
+ if j == len(Sysconfig["dis_package_config"].(map[string]interface{})) {
|
|
|
winnerModel = append(winnerModel, "集成商")
|
|
|
}
|
|
|
}
|
