活动列表详情，新增字段优化

controllers/activity.go

@@ -103,6 +103,13 @@ func (this *ActivityCoAntroller) ActivityList() {
 		br.ErrMsg = "操作失败,Err:" + errSearch.Error()
 		return
 	}
+	if isShowJurisdiction == 1 && chartPermissionIds == "" {
+		resp := new(models.GetCygxActivityListRep)
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+	}
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -122,39 +129,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	}
 
 	condition += ` AND art.publish_status = 1 AND art.active_state  IN (` + activeState + `)`
-	//1专家电话会、2分析师电话会、3公司调研电话会、4公司线下调研、5专家线下沙龙、6分析师线下沙龙
-	//resultTimeNow := time.Now().Format("2006-01-02 15:04:05")
-	//resultTime30 := time.Now().Add(+time.Minute * 30).Format("2006-01-02 15:04:05")
-	//resultTime_30 := time.Now().Add(-time.Minute * 30).Format("2006-01-02 15:04:05")
-	//resultTime60 := time.Now().Add(+time.Minute * 60).Format("2006-01-02 15:04:05")
-	//resultTime_60 := time.Now().Add(-time.Minute * 60).Format("2006-01-02 15:04:05")
-	//if activeState == "1" {
-	//	if len(activityTypeIds) > 0 {
-	//		condition += ` AND art.activity_type_id   IN (` + activityTypeIds + `)`
-	//	}
-	//	condition += ` AND art.activity_time > ` + "'" + resultTimeNow + "'"
-	//} else if activeState == "2" {
-	//	condition += ` AND art.activity_time > ` + "'" + resultTimeNow + "'"
-	//	if len(activityTypeIds) > 0 {
-	//		condition += ` AND art.activity_type_id  IN (` + activityTypeIds + `)`
-	//		condition += ` AND art.activity_time < ` + "'" + resultTime30 + "'"
-	//	} else {
-	//		var sqlOr string
-	//		sqlOr = condition
-	//		condition += ` AND (art.activity_type_id IN ( 1, 2, 3 ) AND  art.activity_time < ` + "'" + resultTime30 + "'" + ")"
-	//		condition += ` OR(art.activity_type_id IN ( 4, 5, 6 ) AND  art.activity_time < ` + "'" + resultTime60 + "'" + sqlOr + ")"
-	//	}
-	//} else {
-	//	if len(activityTypeIds) > 0 {
-	//		condition += ` AND art.activity_type_id  IN (` + activityTypeIds + `)`
-	//		condition += ` AND art.activity_time > ` + "'" + resultTime_30 + "'"
-	//	} else {
-	//		var sqlOr string
-	//		sqlOr = condition
-	//		condition += ` AND (art.activity_type_id IN ( 1, 2, 3 ) AND  art.activity_time <` + "'" + resultTime_30 + "'" + ")"
-	//		condition += ` OR(art.activity_type_id IN ( 4, 5, 6 ) AND  art.activity_time < ` + "'" + resultTime_60 + "'" + sqlOr + ")"
-	//	}
-	//}
+
 	total, err := models.GetActivityCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -164,32 +139,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	if activeState != "1" {
 		condition += ` ORDER BY art.activity_time DESC `
 	}
-	//condition += ` ORDER BY art.activity_time DESC `
 	list, errList := models.GetActivityListAll(condition, pars, uid, startSize, pageSize)
-	//srt30min := "1,2,3"
-	//srt60min := "4,5,6"
-	//for k, v := range list {
-	//	if strings.Contains(srt30min, strconv.Itoa(v.ActivityTypeId)) {
-	//		resultTime := utils.StrTimeToTime(v.ActivityTime) //时间字符串格式转时间格式
-	//		if resultTime.After(time.Now()) {
-	//			list[k].ActiveState = "1"
-	//		} else if time.Now().After(resultTime) && resultTime.After(time.Now().Add(+time.Minute*30)) {
-	//			list[k].ActiveState = "2"
-	//		} else {
-	//			list[k].ActiveState = "3"
-	//		}
-	//	}
-	//	if strings.Contains(srt60min, strconv.Itoa(v.ActivityTypeId)) {
-	//		resultTime := utils.StrTimeToTime(v.ActivityTime) //时间字符串格式转时间格式
-	//		if resultTime.After(time.Now()) {
-	//			list[k].ActiveState = "1"
-	//		} else if time.Now().After(resultTime) && resultTime.After(time.Now().Add(+time.Minute*60)) {
-	//			list[k].ActiveState = "2"
-	//		} else {
-	//			list[k].ActiveState = "3"
-	//		}
-	//	}
-	//}
 	if errList != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + errList.Error()
@@ -295,6 +245,15 @@ func (this *ActivityCoAntroller) Detail() {
 		br.ErrMsg = "获取信息失败,Err:" + errDetail.Error()
 		return
 	}
+	if activityInfo.IsSignup > 0 {
+		detail, errDetail := models.GetActivitySignupDetail(activityId, uid)
+		if errDetail != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + errDetail.Error()
+			return
+		}
+		activityInfo.SignupType = detail.SignupType
+	}
 	activityInfo.ShowType = detail.ShowType
 	br.Ret = 200
 	br.Success = true
@@ -387,6 +346,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		item.Email = user.Email
 		item.CompanyId = user.CompanyId
 		item.CompanyName = user.CompanyName
+		item.SignupType = signupType
 		_, errSignup := models.AddActivitySignup(item)
 		if errSignup != nil {
 			br.Msg = "操作失败"
@@ -662,16 +622,16 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 		return
 	}
 	//if signupStatus == "Success" {
-	total, err := models.GetActivitySignupCount(uid, activityId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	if total == 0 {
-		br.Msg = "您暂未预约外呼这个活动"
-		return
-	}
+	//total, err := models.GetActivitySignupCount(uid, activityId)
+	//if err != nil {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "获取失败，Err:" + err.Error()
+	//	return
+	//}
+	//if total == 0 {
+	//	br.Msg = "您暂未预约外呼这个活动"
+	//	return
+	//}
 
 	totalMeeting, errMeeting := models.GetActivityMeetingReminderCount(uid, activityId)
 	if errMeeting != nil {

models/activity.go

@@ -83,6 +83,7 @@ type ActivityDetail struct {
 	ShowType                string `description:"人数限制类型，1不展示限制，2可选限制，3强制限制"`
 	IsSignup                int    `description:"是否已报名 1是 ，0 否"`
 	SignupNum               int    `description:"已报名人数"`
+	SignupType              int    `description:"报名方式，1预约外呼，2我要报名"`
 	ActiveState             string `description:"活动进行状态 未开始：1、进行中2、已结束3"`
 	IsCancelMeetingReminder int    `description:"是否取消会议提醒 1展示取消会议提醒 ，0展示会议提醒"`
 }
@@ -112,6 +113,7 @@ type CygxActivityList struct {
 	ActivityTypeId          int    `description:"活动类型id"`
 	ActivityName            string `description:"活动名称"`
 	ActivityTypeName        string `description:"活动类型名称"`
+	SignupType              int    `description:"报名方式，1预约外呼，2我要报名"`
 	ChartPermissionId       int    `description:"行业id"`
 	ChartPermissionName     string `description:"行业名称"`
 	IsLimitPeople           int    `description:"是否限制人数 1是，0否"`

models/activity_signup.go

@@ -16,6 +16,7 @@ type CygxActivitySignup struct {
 	CompanyId   int       `description:"公司id"`
 	CompanyName string    `description:"公司名称"`
 	FailType    int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
+	SignupType  int       `description:"报名方式，1预约外呼，2我要报名"`
 }
 
 type SignupStatus struct {
@@ -117,3 +118,11 @@ func CancelActivitySignup(item *CygxActivitySignup) (lastId int64, err error) {
 	lastId, err = o.Insert(itemLog)
 	return
 }
+
+//详情
+func GetActivitySignupDetail(activityId, uid int) (item *CygxActivitySignup, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_activity_signup WHERE  activity_id = ? AND user_id =? `
+	err = o.Raw(sql, activityId, uid).QueryRow(&item)
+	return
+}

services/task.go

@@ -32,10 +32,11 @@ func Task() {
 	//toolbox.AddTask("updateActivitySattus", updateActivitySattus)
 	//SyncTacticsListAddreport()
 	//UpdateActivitySattus()
-	//updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 * * * *", UpdateActivitySattus)
-	//toolbox.AddTask("updateActivitySattus", updateActivitySattus)
+	updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 * * * *", UpdateActivitySattus)
+	toolbox.AddTask("updateActivitySattus", updateActivitySattus)
 
-	UpdateIndustrialManagementLabel()
+	updateIndustrialManagementLabel := toolbox.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+	toolbox.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
 	toolbox.StartTask()
 
 	//if utils.RunMode == "debug" {