|
@@ -66,6 +66,10 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
|
|
condition += ` AND art.days > 0 AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
|
|
condition += ` AND art.days > 0 AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if activeState == "1" {
|
|
|
|
+ condition += ` AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
|
|
|
|
+ }
|
|
|
|
+
|
|
//if activeState == "" && whichDay == "" {
|
|
//if activeState == "" && whichDay == "" {
|
|
// condition += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
|
|
// condition += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
|
|
//}
|
|
//}
|