Merge branch 'cygx_10.12' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity.go

@@ -96,6 +96,9 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 		req.Scale = ""
 		req.CustomerTypeIds = ""
 	}
+	if req.IsResearchPoints == 0 {
+		req.SiginupDeadline = ""
+	}
 	activityId := req.ActivityId
 	labelType := req.LabelType
 	labelList := req.List

controllers/cygx/activity_signup.go

@@ -296,13 +296,13 @@ func (this *ActivitySignupCoAntroller) AppointmentList() {
 	}
 	for k, v := range list {
 		//公司调研电话会的活动，研选扣点的展示自主拨入，非扣点的展示预约外呼
-		if activityInfo.ActivityTypeId == 3 {
-			if activityInfo.IsResearchPoints == 1 {
-				v.SignupType = 2
-			} else {
-				v.SignupType = 1
-			}
-		}
+		//if activityInfo.ActivityTypeId == 3 {
+		//	if activityInfo.IsResearchPoints == 1 {
+		//		v.SignupType = 2
+		//	} else {
+		//		v.SignupType = 1
+		//	}
+		//}
 		list[k].SellerName = v.PsellerName
 	}
 	respList := new(cygx.GetAppointmentListRep)