Merge branch 'feature/v4.9.9_ws' of qmx/jy into feature/v4.9.9

src/jfw/modules/subscribepay/src/timetask/dataExportMail.go

@@ -23,7 +23,7 @@ func SendDataExportMailForPayed() {
 			config.TimeTaskConfig.DataExportSendMailDuringMinute, DataExportSendMailDuringMinuteDefaultValue).(int)), SendDataExportMailForPayed)
 	}()
 
-	unServiceList := util.Mysql.Find("dataexport_order", map[string]interface{}{"product_type": "历史数据", "order_status": 1, "service_status": 0}, "download_url,user_mail,data_count,pay_time,order_code", "", -1, -1)
+	unServiceList := util.Mysql.Find("dataexport_order", map[string]interface{}{"order_code": "261012153631"}, "download_url,user_mail,data_count,pay_time,order_code", "", -1, -1)
 	if unServiceList == nil || len(*unServiceList) == 0 {
 		log.Printf("SendDataExportMailForPayed not find Payed order")
 		return

src/jfw/modules/subscribepay/src/util/dataExportExcel.go

@@ -184,10 +184,11 @@ func CreateDataExportExcelFile(list *[]map[string]interface{}, isSenior bool, fi
 						if v.Filed != "legal_person" && v.Filed != "company_phone" && v.Filed != "company_email" && v.Filed != "company_name" {
 							if index == 0 {
 								cell.VMerge = winnerTotal - 1
-
 								if v.Filed == "title" || v.Filed == "url" {
+									//cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["url_jump"], data[v.Filed]))
 									cell.SetHyperlink(qutil.ObjToString(data["url_jump"]), qutil.ObjToString(data[v.Filed]), "")
 								} else if v.Filed == "href" {
+									//cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["href"], data[v.Filed]))
 									cell.SetHyperlink(qutil.ObjToString(data["href"]), qutil.ObjToString(data[v.Filed]), "")
 								} else {
 									cell.SetValue(data[v.Filed])
@@ -216,9 +217,11 @@ func CreateDataExportExcelFile(list *[]map[string]interface{}, isSenior bool, fi
 						Alignment: defaultExcelAlignment,
 					}
 					if v.Filed == "title" || v.Filed == "url" {
-						cell.SetHyperlink(qutil.ObjToString(data["url_jump"]), qutil.ObjToString(data[v.Filed]), "")
+						cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["url_jump"], data[v.Filed]))
+						//cell.SetHyperlink(qutil.ObjToString(data["url_jump"]), qutil.ObjToString(data[v.Filed]), "")
 					} else if v.Filed == "href" {
-						cell.SetHyperlink(qutil.ObjToString(data["href"]), qutil.ObjToString(data[v.Filed]), "")
+						cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["href"], data[v.Filed]))
+						//cell.SetHyperlink(qutil.ObjToString(data["href"]), qutil.ObjToString(data[v.Filed]), "")
 					} else {
 						cell.SetValue(data[v.Filed])
 					}