|
@@ -1362,28 +1362,28 @@ 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)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- //预约纪要
|
|
|
- summaryList, err = cygx.GetCygxAppointmentSummaryList(activityId, sqlStrOther)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- if excelType == 1 {
|
|
|
- sqlStr += ` AND s.signup_type = 1 `
|
|
|
- } else if excelType == 2 {
|
|
|
- sqlStr += ` AND s.signup_type != 1 `
|
|
|
- }
|
|
|
+ //if activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 2 {
|
|
|
+ var err error
|
|
|
+ //消息提醒
|
|
|
+ listReminder, err = cygx.GetCygxActivityMeetingReminderList(activityId, sqlStrOther)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
}
|
|
|
+ //预约纪要
|
|
|
+ summaryList, err = cygx.GetCygxAppointmentSummaryList(activityId, sqlStrOther)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if excelType == 1 {
|
|
|
+ sqlStr += ` AND s.signup_type = 1 `
|
|
|
+ } else if excelType == 2 {
|
|
|
+ sqlStr += ` AND s.signup_type != 1 `
|
|
|
+ }
|
|
|
+ //}
|
|
|
list, err := cygx.GetCygxAppointmentList(activityId, sqlStr)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|