Merge remote-tracking branch 'origin/master'

controllers/cygx/activity_signup.go

@@ -1362,7 +1362,7 @@ func (this *ActivitySignupCoAntroller) SignupFailExport() {
 	sqlStrOther := sqlStr
 	var listReminder []*cygx.CygxAppointmentList
 	var summaryList []*cygx.CygxAppointmentList
-	//if activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 2 {
+
 	var err error
 	//消息提醒
 	listReminder, err = cygx.GetCygxActivityMeetingReminderList(activityId, sqlStrOther)
@@ -1381,7 +1381,7 @@ func (this *ActivitySignupCoAntroller) SignupFailExport() {
 	if excelType == 1 {
 		sqlStr += ` AND  s.signup_type = 1 `
 	} else if excelType == 2 {
-		sqlStr += ` AND  s.signup_type != 1 `
+		sqlStr += ` AND  s.signup_type IN (2,4) `
 	}
 	//}
 	list, err := cygx.GetCygxAppointmentList(activityId, sqlStr)
@@ -1445,9 +1445,11 @@ func (this *ActivitySignupCoAntroller) SignupFailExport() {
 				cellC := rowTitle.AddCell()
 				cellC.Value = "国际代码"
 				cellD := rowTitle.AddCell()
-				cellD.Value = "公司名称"
+				cellD.Value = "邮箱"
 				cellE := rowTitle.AddCell()
-				cellE.Value = "所属销售"
+				cellE.Value = "公司名称"
+				cellF := rowTitle.AddCell()
+				cellF.Value = "所属销售"
 
 				for _, item := range listDate {
 					row := sheet.AddRow()
@@ -1458,9 +1460,11 @@ func (this *ActivitySignupCoAntroller) SignupFailExport() {
 					cellC := row.AddCell()
 					cellC.Value = item.CountryCode
 					cellD := row.AddCell()
-					cellD.Value = item.CompanyName
+					cellD.Value = item.Email
 					cellE := row.AddCell()
-					cellE.Value = item.SellerName
+					cellE.Value = item.CompanyName
+					cellF := row.AddCell()
+					cellF.Value = item.SellerName
 				}
 			} else {
 				rowTitle := sheet.AddRow()