Merge branch 'dev1.4' of http://192.168.3.207:10080/qmx/datatag into dev1.4

customerdata/src/util.go

@@ -665,27 +665,41 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 		}
 	}*/
 	//匹配公告附件
-	filesArr := []map[string]interface{}{}
 	info := MgoBidding.FindOne(BiddingColl, map[string]interface{}{"_id": mongodb.StringTOBsonId(id)})
 	if info != nil && len(info) > 0 {
 		if info["projectinfo"] != nil {
 			projectInfo := qu.ObjToMap(info["projectinfo"])
 			if (*projectInfo)["attachments"] != nil {
+				filesArr := []map[string]interface{}{}
 				fileUrl := Sysconfig.FileUrl
 				attachments := (*projectInfo)["attachments"].(map[string]interface{})
 				for _, v := range attachments {
 					atta := v.(map[string]interface{})
-					fileMap := map[string]interface{}{
-						"filename": atta["filename"],
-						"url":      fileUrl + qu.ObjToString(atta["ossid"]),
+					if atta["fid"] != nil {
+						fileMap := map[string]interface{}{
+							"filename": atta["filename"],
+							"url":      fileUrl + qu.ObjToString(atta["fid"]),
+						}
+						filesArr = append(filesArr, fileMap)
+					} else {
+						if atta["org_url"] != nil {
+							fileMap := map[string]interface{}{
+								"filename": atta["filename"],
+								"url":      qu.ObjToString(atta["org_url"]),
+							}
+							filesArr = append(filesArr, fileMap)
+						}
 					}
-					filesArr = append(filesArr, fileMap)
+
+				}
+				log.Println("查询附件结果：", id, "附件数量：", len(filesArr))
+				if len(filesArr) > 0 {
+					tmp["filehref"] = filesArr
 				}
 			}
 		}
 	}
-	log.Println("查询附件结果：", id, len(filesArr))
-	tmp["files"] = filesArr
+
 	redis.Put("datag", appid+"_"+id, 1, 3*24*60*60)
 	MgoSaveCache <- tmp
 	return true

src/history/util_history.go

@@ -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               //含字母
@@ -696,14 +696,26 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 				attachments := (*projectInfo)["attachments"].(map[string]interface{})
 				for _, v := range attachments {
 					atta := v.(map[string]interface{})
-					fileMap := map[string]interface{}{
-						"filename": atta["filename"],
-						"url":      fileUrl + qu.ObjToString(atta["fid"]),
+					if atta["fid"] != nil {
+						fileMap := map[string]interface{}{
+							"filename": atta["filename"],
+							"url":      fileUrl + qu.ObjToString(atta["fid"]),
+						}
+						filesArr = append(filesArr, fileMap)
+					} else {
+						if atta["org_url"] != nil {
+							fileMap := map[string]interface{}{
+								"filename": atta["filename"],
+								"url":      qu.ObjToString(atta["org_url"]),
+							}
+							filesArr = append(filesArr, fileMap)
+						}
 					}
-					filesArr = append(filesArr, fileMap)
 				}
 				log.Println("查询附件结果：", id, "附件数量：", len(filesArr))
-				tmp["filehref"] = filesArr
+				if len(filesArr) > 0 {
+					tmp["filehref"] = filesArr
+				}
 			}
 		}
 	}
@@ -928,7 +940,7 @@ func SaveUsermailMgo() {
 					defer func() {
 						<-SP
 					}()
-					MgoCus.SaveBulk(SaveUserMail, arru...)
+					MgoSave.SaveBulk(SaveUserMail, arru...)
 				}(arru)
 				arru = make([]map[string]interface{}, 500)
 				indexu = 0
@@ -940,7 +952,7 @@ func SaveUsermailMgo() {
 					defer func() {
 						<-SP
 					}()
-					MgoCus.SaveBulk(SaveUserMail, arru...)
+					MgoSave.SaveBulk(SaveUserMail, arru...)
 				}(arru[:indexu])
 				arru = make([]map[string]interface{}, 500)
 				indexu = 0
@@ -1358,7 +1370,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()

src/service/customer_service.go

@@ -1037,7 +1037,6 @@ func (c *Customer) CustomerHistory() {
 		return
 	}
 	c.T["history_id"] = history_id
-	fmt.Println(c.T)
 	c.Render("private/customer_history.html", &c.T)
 }
 

src/service/second_push.go

@@ -259,8 +259,7 @@ func (s *SecondPush) SecondPushTask() {
 								}
 							}
 							if len(updateMap) > 0 {
-								b := MgoCus.UpdateBulk("usermail", updateMap...)
-								log.Println("项目id更新是否成功", b)
+								MgoCus.UpdateBulk("usermail", updateMap...)
 							}
 						}
 					}
@@ -282,8 +281,7 @@ func (s *SecondPush) SecondPushTask() {
 						xlsxArr = append(xlsxArr, l)
 					}
 					if len(updateMap) > 0 {
-						b := MgoCus.UpdateBulk("usermail", updateMap...)
-						log.Println("项目id更新是否成功", b)
+						MgoCus.UpdateBulk("usermail", updateMap...)
 					}
 				}
 				if len(xlsxArr) == 0 {
@@ -318,7 +316,6 @@ func searchProjectId(l map[string]interface{}, updateMap [][]map[string]interfac
 	} else {
 		l["projectId"] = ""
 		_projectid = ""
-		log.Println(l["id"], "未匹配到项目id")
 	}
 	updateMap = append(updateMap, []map[string]interface{}{
 		map[string]interface{}{
@@ -331,8 +328,7 @@ func searchProjectId(l map[string]interface{}, updateMap [][]map[string]interfac
 		},
 	})
 	if len(updateMap) > 500 {
-		b := MgoCus.UpdateBulk("usermail", updateMap...)
-		log.Println("项目id更新是否成功", b)
+		MgoCus.UpdateBulk("usermail", updateMap...)
 		updateMap = [][]map[string]interface{}{}
 	}
 	return updateMap