Merge branch 'bzq/dev' of eta_mini/eta_mini_crm into master

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/minio/minio-go/v7 v7.0.74
 	github.com/olivere/elastic/v7 v7.0.32
 	github.com/rdlucklib/rdluck_tools v1.0.3
+	github.com/tealeg/xlsx v1.0.5
 )
 
 require (

models/report_push_status.go

@@ -126,13 +126,13 @@ func GetReportPushStatusListByCondition(condition, sortCondition string, pars []
 	return
 }
 
-func GetReportByCondition(condition string) (items []*Report, err error) {
+func GetReportByCondition(condition string, pars []interface{}) (items []*Report, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM report WHERE 1=1 AND (state=2 OR state=6) `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql).QueryRows(&items)
+	_, err = o.Raw(sql, pars...).QueryRows(&items)
 	return
 }
 

scheduler/task.go

@@ -18,8 +18,8 @@ func InitJob() {
 	// 每天凌晨12点检测, 修改用户状态
 	tk2 := task.NewTask("ModifyUserStatus", "5 0 0 * * *", ModifyUserStatus)
 	task.AddTask("定时修改用户状态", tk2)
-	// 每隔1分钟，同步报告状态
-	tk3 := task.NewTask("SyncReportPushStatus", "0 0/1 * * * *", SyncReportPushStatus)
+	// 每隔5分钟，同步报告状态
+	tk3 := task.NewTask("SyncReportPushStatus", "0 0/5 * * * *", SyncReportPushStatus)
 	task.AddTask("定时同步报告推送状态", tk3)
 	task.StartTask()
 }
@@ -34,9 +34,12 @@ func SyncReportPushStatus(ctx context.Context) (err error) {
 		}
 	}()
 
-	// 获取前三分钟修改的数据
-	conditon := " AND modify_time >= NOW() - INTERVAL 3 MINUTE"
-	reportList, err := models.GetReportByCondition(conditon)
+	// 获取前30分钟修改的数据
+	startTime := time.Now().Add(-30 * time.Minute).Format(utils.FormatDateTime)
+	conditon := " AND modify_time >= ?"
+	var pars []interface{}
+	pars = append(pars, startTime)
+	reportList, err := models.GetReportByCondition(conditon, pars)
 	var reportIds []int
 	for _, v := range reportList {
 		reportIds = append(reportIds, v.Id)