Browse Source

Merge branch 'hotfix/english_policy_report' of eta_server/eta_api into master

xyxie 1 year ago
parent
commit
987bd64037
2 changed files with 4 additions and 7 deletions
  1. 1 4
      controllers/english_report/report.go
  2. 3 3
      services/english_policy_report.go

+ 1 - 4
controllers/english_report/report.go

@@ -956,10 +956,7 @@ func (this *EnglishReportController) Delete() {
 	go func() {
 		_ = services.ResetPPTReport(req.ReportIds, true)
 	}()
-
-	go func() {
-		_ = services.EnglishPolicyReportSyncCancel(reportInfo)
-	}()
+	
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "删除成功"

+ 3 - 3
services/english_policy_report.go

@@ -2,11 +2,11 @@ package services
 
 import (
 	"encoding/json"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/http"
 	"eta/eta_api/models"
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"time"
 )
 
@@ -165,7 +165,7 @@ func getOriginPolicyReportList() (list []EnPolicyReportDataListItem, err error)
 	mode := "all"
 	startDt := ""
 	// 获取当天的报告
-	startDt = time.Now().Format(utils.FormatDate)
+	startDt = time.Now().AddDate(0, 0, -7).Format(utils.FormatDate)
 	//设置接口地址
 	//处理返回值
 	url := utils.EnPolicyReportUrl + `articles/index?type_id=%d&field_id=%d&take=%d&skip=%d&publish_status=%s&mode=%s&start_dt=%s`