|
|
@@ -67,7 +67,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 //含字母
|
|
|
@@ -119,7 +119,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 //含字母
|
|
|
@@ -697,7 +697,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
|
|
|
if attachments, oks := (*projectInfo)["attachments"].(map[string]interface{}); oks {
|
|
|
for _, v := range attachments {
|
|
|
if atta, ok := v.(map[string]interface{}); ok {
|
|
|
- if atta["fid"] != nil {
|
|
|
+ if atta["fid"] != nil && qu.ObjToString(atta["fid"]) != "" {
|
|
|
fileMap := map[string]interface{}{
|
|
|
"filename": atta["filename"],
|
|
|
"url": fileUrl + qu.ObjToString(atta["fid"]),
|
|
|
@@ -1374,7 +1374,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()
|
