拟建采购单位名称修改

src/jfw/front/shorturl.go

@@ -1188,38 +1188,47 @@ func KeyWordHandle(obj map[string]interface{}) string {
 func DescriptionHandle(stype string, obj map[string]interface{}) string {
 	description := ""
 	pushTime := time.Unix(util.Int64All(obj["publishtime"]), 0)
+	title := util.InterfaceToStr(obj["title"])
+	owner := util.InterfaceToStr(obj["owner"])
+	subtype := util.InterfaceToStr(obj["subtype"])
+	buyer := util.InterfaceToStr(obj["buyer"])
+	if subtype == "拟建" {
+		buyer = owner
+	}
+	s_winner := util.InterfaceToStr(obj["s_winner"])
+	publishtime := util.Int64All(obj["publishtime"])
+	area := util.InterfaceToStr(obj["area"])
+	city := util.InterfaceToStr(obj["city"])
 	if stype == "bdprivate" {
 		//bdprivate
 		//{项目标题}，采购单位：{采购单位名称}，成交供应商：{中标企业名称}，公告日期：{公告日期}。
 		descriptionArr := []string{}
-		if util.InterfaceToStr(obj["title"]) != "" {
-			descriptionArr = append(descriptionArr, util.InterfaceToStr(obj["title"]))
+		if title != "" {
+			descriptionArr = append(descriptionArr, title)
 		}
-		if util.InterfaceToStr(obj["buyer"]) != "" {
-			descriptionArr = append(descriptionArr, fmt.Sprintf("采购单位：%s", util.InterfaceToStr(obj["buyer"])))
+		if buyer != "" {
+			descriptionArr = append(descriptionArr, fmt.Sprintf("采购单位：%s", buyer))
 		}
-		if util.InterfaceToStr(obj["s_winner"]) != "" {
-			descriptionArr = append(descriptionArr, fmt.Sprintf("成交供应商：%s", util.InterfaceToStr(obj["s_winner"])))
+		if s_winner != "" {
+			descriptionArr = append(descriptionArr, fmt.Sprintf("成交供应商：%s", s_winner))
 		}
-		if util.Int64All(obj["publishtime"]) != 0 {
+		if publishtime != 0 {
 			descriptionArr = append(descriptionArr, fmt.Sprintf("公告日期：%s", pushTime.Format("2006年01月02日")))
 		}
 		description = strings.Join(descriptionArr, ",")
 	} else {
 		//descriptionStr = "%s，项目所属地区是%s%s，项目采购单位是%s，项目发布时间是%s"
 		descriptionArr := []string{}
-		if util.InterfaceToStr(obj["title"]) != "" {
-			descriptionArr = append(descriptionArr, util.InterfaceToStr(obj["title"]))
+		if title != "" {
+			descriptionArr = append(descriptionArr, title)
 		}
-		area := util.InterfaceToStr(obj["area"])
-		city := util.InterfaceToStr(obj["city"])
 		if area != "" || city != "" {
 			descriptionArr = append(descriptionArr, fmt.Sprintf("项目所属地区是%s%s", area, city))
 		}
-		if util.InterfaceToStr(obj["buyer"]) != "" {
-			descriptionArr = append(descriptionArr, fmt.Sprintf("项目采购单位是%s", util.InterfaceToStr(obj["buyer"])))
+		if buyer != "" {
+			descriptionArr = append(descriptionArr, fmt.Sprintf("项目采购单位是%s", buyer))
 		}
-		if util.Int64All(obj["publishtime"]) != 0 {
+		if publishtime != 0 {
 			descriptionArr = append(descriptionArr, fmt.Sprintf("项目发布时间是%s", pushTime.Format("2006年01月02日")))
 		}
 		description = strings.Join(descriptionArr, ",")

src/jfw/modules/app/src/app/front/shorturl.go

@@ -676,38 +676,47 @@ func KeyWordHandle(obj map[string]interface{}) string {
 func DescriptionHandle(stype string, obj map[string]interface{}) string {
 	description := ""
 	pushTime := time.Unix(util.Int64All(obj["publishtime"]), 0)
+	title := util.InterfaceToStr(obj["title"])
+	owner := util.InterfaceToStr(obj["owner"])
+	subtype := util.InterfaceToStr(obj["subtype"])
+	buyer := util.InterfaceToStr(obj["buyer"])
+	if subtype == "拟建" {
+		buyer = owner
+	}
+	s_winner := util.InterfaceToStr(obj["s_winner"])
+	publishtime := util.Int64All(obj["publishtime"])
+	area := util.InterfaceToStr(obj["area"])
+	city := util.InterfaceToStr(obj["city"])
 	if stype == "bdprivate" {
 		//bdprivate
 		//{项目标题}，采购单位：{采购单位名称}，成交供应商：{中标企业名称}，公告日期：{公告日期}。
 		descriptionArr := []string{}
-		if util.InterfaceToStr(obj["title"]) != "" {
-			descriptionArr = append(descriptionArr, util.InterfaceToStr(obj["title"]))
+		if title != "" {
+			descriptionArr = append(descriptionArr, title)
 		}
-		if util.InterfaceToStr(obj["buyer"]) != "" {
-			descriptionArr = append(descriptionArr, fmt.Sprintf("采购单位：%s", util.InterfaceToStr(obj["buyer"])))
+		if buyer != "" {
+			descriptionArr = append(descriptionArr, fmt.Sprintf("采购单位：%s", buyer))
 		}
-		if util.InterfaceToStr(obj["s_winner"]) != "" {
-			descriptionArr = append(descriptionArr, fmt.Sprintf("成交供应商：%s", util.InterfaceToStr(obj["s_winner"])))
+		if s_winner != "" {
+			descriptionArr = append(descriptionArr, fmt.Sprintf("成交供应商：%s", s_winner))
 		}
-		if util.Int64All(obj["publishtime"]) != 0 {
+		if publishtime != 0 {
 			descriptionArr = append(descriptionArr, fmt.Sprintf("公告日期：%s", pushTime.Format("2006年01月02日")))
 		}
 		description = strings.Join(descriptionArr, ",")
 	} else {
 		//descriptionStr = "%s，项目所属地区是%s%s，项目采购单位是%s，项目发布时间是%s"
 		descriptionArr := []string{}
-		if util.InterfaceToStr(obj["title"]) != "" {
-			descriptionArr = append(descriptionArr, util.InterfaceToStr(obj["title"]))
+		if title != "" {
+			descriptionArr = append(descriptionArr, title)
 		}
-		area := util.InterfaceToStr(obj["area"])
-		city := util.InterfaceToStr(obj["city"])
 		if area != "" || city != "" {
 			descriptionArr = append(descriptionArr, fmt.Sprintf("项目所属地区是%s%s", area, city))
 		}
-		if util.InterfaceToStr(obj["buyer"]) != "" {
-			descriptionArr = append(descriptionArr, fmt.Sprintf("项目采购单位是%s", util.InterfaceToStr(obj["buyer"])))
+		if buyer != "" {
+			descriptionArr = append(descriptionArr, fmt.Sprintf("项目采购单位是%s", buyer))
 		}
-		if util.Int64All(obj["publishtime"]) != 0 {
+		if publishtime != 0 {
 			descriptionArr = append(descriptionArr, fmt.Sprintf("项目发布时间是%s", pushTime.Format("2006年01月02日")))
 		}
 		description = strings.Join(descriptionArr, ",")