公开会议数据合并

models/roadshow/public_meeting.go

@@ -7,14 +7,14 @@ import (
 //公开会议总览
 
 //获取公开会议
-func GetPublicMeetingList() (list []*RsCalendarResearcher, err error) {
+func GetPublicMeetingList(endDate string) (list []*RsCalendarResearcher, err error) {
 	sql := ` SELECT b.* FROM rs_calendar AS a
 			INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-			WHERE activity_type='公开会议'
-			AND a.union_code=''
+			WHERE a.source=0 AND activity_type='公开会议'
+			AND b.end_date>=?
 			ORDER BY a.rs_calendar_id ASC  `
 	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&list)
+	_, err = o.Raw(sql, endDate).QueryRows(&list)
 	return
 }
 

services/roadshow/public_meeting.go

@@ -6,11 +6,12 @@ import (
 	"hongze/hongze_task/utils"
 	"strconv"
 	"time"
+	"context"
 )
 
-func SetPublicMeetingUnionCode() {
-	var err error
-	list, err := roadshow.GetPublicMeetingList()
+func SetPublicMeetingUnionCode(cont context.Context)(err error) {
+	now:=time.Now().Format(utils.FormatDate)
+	list, err := roadshow.GetPublicMeetingList(now)
 	if err != nil {
 		return
 	}
@@ -49,4 +50,5 @@ func SetPublicMeetingUnionCode() {
 			}
 		}
 	}
+	return
 }

services/task.go

@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-func Task() {
+func Task123() {
 	fmt.Println("task start")
 	//如果是生产环境，才需要走这些任务
 	if utils.RunMode == "release" {
@@ -92,11 +92,22 @@ func Task() {
 	//CRM 6.3 客户列表路演次数统计
 	roadShowTotal := task.NewTask("roadShowTotal", "0 */30 * * * *", roadshow.RoadShow)
 	task.AddTask("roadShowTotal", roadShowTotal)
+
+	//路演公开会议合并
+	//setPublicMeetingUnionCode := task.NewTask("setPublicMeetingUnionCode", "0 */30 * * * *", roadshow.SetPublicMeetingUnionCode)
+	//task.AddTask("setPublicMeetingUnionCode", setPublicMeetingUnionCode)
+
 	task.StartTask()
 
 	fmt.Println("task end")
 }
 
+//func Task() {
+//	fmt.Println("start")
+//	roadshow.SetPublicMeetingUnionCode()
+//	fmt.Println("end")
+//}
+
 //生产环境需要走的任务
 func releaseTask() {
 	//隆众调研指标获取
@@ -162,12 +173,6 @@ func releaseTask() {
 	task.AddTask("resetEdbInfoIsUpdate", resetEdbInfoIsUpdate)
 }
 
-//func Task() {
-//	fmt.Println("start")
-//	roadshow.SetPublicMeetingUnionCode()
-//	fmt.Println("end")
-//}
-
 func TaskTest() {
 	fmt.Println("The task is start")
 	//companyReportPermissionClose := task.NewTask("companyTryOut", "0 5 0 * * *", CompanyReportPermissionClose)