no message

controllers/activity_special.go

@@ -49,7 +49,7 @@ func (this *ActivitySpecialController) SpecialList() {
 	}
 
 	conditionActivity := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
-	list, total, errList := services.GetActivitySpecialList(user, currentIndex, pageSize, "", conditionActivity)
+	list, total, errList := services.GetActivitySpecialList(user, currentIndex, pageSize, "", conditionActivity, activeState)
 	if errList != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + errList.Error()

services/activity_special.go

@@ -66,9 +66,9 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		condition += `   AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	}
 
-	if activeState == "" && whichDay == "" {
-		condition += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
-	}
+	//if activeState == "" && whichDay == "" {
+	//	condition += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
+	//}
 
 	if activeState != "" || whichDay != "" {
 		condition += `  AND art.days > 0  `
@@ -403,8 +403,14 @@ func GetSpecialTripUserSchedule(userId int) (total int, err error) {
 }
 
 //GetActivitySpecialList 获取专项调研列表
-func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int, keywords, conditionActivity string) (list []*models.CygxActivitySpecialDetail, total int, err error) {
-	listConfirm, totalConfirm, e := GetActivityLabelSpecialConfirmList(user, (currentIndex-1)*pageSize, pageSize, 0, keywords, conditionActivity)
+func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int, keywords, conditionActivity, activeState string) (list []*models.CygxActivitySpecialDetail, total int, err error) {
+
+	state := 4
+	if activeState == "" {
+		state = 3
+	}
+
+	listConfirm, totalConfirm, e := GetActivityLabelSpecialConfirmList(user, (currentIndex-1)*pageSize, pageSize, state, keywords, conditionActivity)
 	if e != nil {
 		err = errors.New("GetActivityLabelSpecialConfirmList, Err: " + e.Error())
 		return