WH01243 2 жил өмнө
parent
commit
6a6d1782dc

+ 3 - 3
src/jfw/front/shorturl.go

@@ -1172,7 +1172,7 @@ func KeyWordHandle(obj map[string]interface{}) string {
 			}
 		}
 	}
-	if util.InterfaceToStr(obj["subtype"]) != "" {
+	if util.InterfaceToStr(obj["subtype"]) != "" && util.InterfaceToStr(obj["subtype"]) != "其它" {
 		keywordArr = append(keywordArr, TypeCodeMap[util.InterfaceToStr(obj["subtype"])])
 	}
 	if util.InterfaceToStr(obj["area"]) != "" {
@@ -1193,10 +1193,10 @@ func DescriptionHandle(stype string, obj map[string]interface{}) string {
 		//bdprivate
 		//{项目标题},采购单位:{采购单位名称},成交供应商:{中标企业名称},公告日期:{公告日期}。
 		descriptionStr = "%s,采购单位1:%s,成交供应商:%s,公告日期:%s。"
-		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["buyer"]), util.InterfaceToStr(obj["s_winner"]), pushTime.Format("2006年01月02日"))
+		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["buyer"]), util.InterfaceToStr(obj["s_winner"]), util.If(util.Int64All(obj["publishtime"]) == 0, "", pushTime.Format("2006年01月02日")))
 	} else {
 		descriptionStr = "%s,项目所属地区是%s%s,项目采购单位是%s,项目发布时间是%s"
-		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["area"]), util.InterfaceToStr(obj["city"]), util.InterfaceToStr(obj["buyer"]), pushTime.Format("2006年01月02日"))
+		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["area"]), util.InterfaceToStr(obj["city"]), util.InterfaceToStr(obj["buyer"]), util.If(util.Int64All(obj["publishtime"]) == 0, "", pushTime.Format("2006年01月02日")))
 	}
 	return description
 }

+ 3 - 3
src/jfw/modules/app/src/app/front/shorturl.go

@@ -660,7 +660,7 @@ func KeyWordHandle(obj map[string]interface{}) string {
 			}
 		}
 	}
-	if util.InterfaceToStr(obj["subtype"]) != "" {
+	if util.InterfaceToStr(obj["subtype"]) != "" && util.InterfaceToStr(obj["subtype"]) != "其它" {
 		keywordArr = append(keywordArr, TypeCodeMap[util.InterfaceToStr(obj["subtype"])])
 	}
 	if util.InterfaceToStr(obj["area"]) != "" {
@@ -681,10 +681,10 @@ func DescriptionHandle(stype string, obj map[string]interface{}) string {
 		//bdprivate
 		//{项目标题},采购单位:{采购单位名称},成交供应商:{中标企业名称},公告日期:{公告日期}。
 		descriptionStr = "%s,采购单位1:%s,成交供应商:%s,公告日期:%s。"
-		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["buyer"]), util.InterfaceToStr(obj["s_winner"]), pushTime.Format("2006年01月02日"))
+		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["buyer"]), util.InterfaceToStr(obj["s_winner"]), util.If(util.Int64All(obj["publishtime"]) == 0, "", pushTime.Format("2006年01月02日")))
 	} else {
 		descriptionStr = "%s,项目所属地区是%s%s,项目采购单位是%s,项目发布时间是%s"
-		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["area"]), util.InterfaceToStr(obj["city"]), util.InterfaceToStr(obj["buyer"]), pushTime.Format("2006年01月02日"))
+		description = fmt.Sprintf(descriptionStr, util.InterfaceToStr(obj["title"]), util.InterfaceToStr(obj["area"]), util.InterfaceToStr(obj["city"]), util.If(util.Int64All(obj["publishtime"]) == 0, "", pushTime.Format("2006年01月02日")))
 	}
 	return description
 }