优化指标刷新通知

services/data/edb_info_notice.go

@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-//指标更新通知
+// 指标更新通知
 func RefreshNotice() (err error) {
 	defer func() {
 		if err != nil {
@@ -19,9 +19,13 @@ func RefreshNotice() (err error) {
 	var condition string
 	var pars []interface{}
 
-	endDate := time.Now().AddDate(0, -6, 0)
+	endDate := time.Now().AddDate(0, -2, 0)
 	condition += ` AND end_date > ? `
 	pars = append(pars, endDate)
+
+	condition += ` AND end_date < ? `
+	pars = append(pars, time.Now().Format(utils.FormatDate))
+
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 1)
 	if err != nil {
 		return errors.New("GetEdbInfoByCondition:" + err.Error())
@@ -74,20 +78,20 @@ func RefreshNotice() (err error) {
     </thead>`
 	monthTableBody := `<tbody>`
 
-	allDiv := `<hr style="color: red">`
-	allDiv = `<div style="margin-bottom: 20px;min-width: 1000px;overflow-x: scroll;"><div>当前所有指标，按数据日期升序排列:</div>`
-	allTable := `<table border="1" style="border-collapse: collapse;">
-    <thead>
-    <tr>
-        <td>指标编码</td>
-        <td>指标名称</td>
-        <td>指标来源</td>
-		<td>频度</td>
-        <td>指标数据最后日期</td>
-        <td>指标数据更新日期</td>
-    </tr>
-    </thead>`
-	allTableBody := `<tbody>`
+	//allDiv := `<hr style="color: red">`
+	//allDiv = `<div style="margin-bottom: 20px;min-width: 1000px;overflow-x: scroll;"><div>当前所有指标，按数据日期升序排列:</div>`
+	//allTable := `<table border="1" style="border-collapse: collapse;">
+	//<thead>
+	//<tr>
+	//    <td>指标编码</td>
+	//    <td>指标名称</td>
+	//    <td>指标来源</td>
+	//	<td>频度</td>
+	//    <td>指标数据最后日期</td>
+	//    <td>指标数据更新日期</td>
+	//</tr>
+	//</thead>`
+	//allTableBody := `<tbody>`
 
 	dayDate := time.Now().AddDate(0, 0, -3)
 	weekDate := time.Now().AddDate(0, 0, -7)
@@ -107,7 +111,7 @@ func RefreshNotice() (err error) {
 			monthTableBody += getTableTr(v, 3)
 		}
 
-		allTableBody += getTableTr(v, 4)
+		//allTableBody += getTableTr(v, 4)
 	}
 	dayTable += dayTableBody
 	dayTable += ` </tbody></table></div>`
@@ -124,9 +128,9 @@ func RefreshNotice() (err error) {
 	noticeSendBody += monthDiv + monthTable
 	noticeSendBody += `<br/>`
 
-	allTable += allTableBody
-	allTable += ` </tbody></table></div>`
-	noticeSendBody += allDiv + allTable
+	//allTable += allTableBody
+	//allTable += ` </tbody></table></div>`
+	//noticeSendBody += allDiv + allTable
 
 	go utils.SendEmailByHongze("指标更新情况通知", noticeSendBody, utils.RefreshEdbInfoEmailSendToUsers, "", "")
 	//utils.SendEmailByHongze("指标更新情况通知", noticeSendBody, "317699326@qq.com", "", "")