|
@@ -323,22 +323,22 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
|
|
|
var pars []interface{}
|
|
|
condition += ` AND art.days >0 AND art.publish_status =1 AND art.is_offline = 0 `
|
|
|
if state == 1 {
|
|
|
- condition += ` AND art.activity_time > ? `
|
|
|
- pars = append(pars, time.Now())
|
|
|
+ condition += ` AND art.activity_time > '` + time.Now().Format(utils.FormatDateTime) + `'`
|
|
|
+ //pars = append(pars, time.Now())
|
|
|
}
|
|
|
if state == 2 {
|
|
|
- condition += ` AND art.activity_time < ? `
|
|
|
- pars = append(pars, time.Now())
|
|
|
- condition += ` AND art.activity_time_end > ? `
|
|
|
- pars = append(pars, time.Now())
|
|
|
+ condition += ` AND art.activity_time < '` + time.Now().Format(utils.FormatDateTime) + `'`
|
|
|
+ //pars = append(pars, time.Now())
|
|
|
+ condition += ` AND art.activity_time_end > '` + time.Now().Format(utils.FormatDateTime) + `'`
|
|
|
+ //pars = append(pars, time.Now())
|
|
|
}
|
|
|
if state == 3 {
|
|
|
- condition += ` AND art.activity_time_end < ? `
|
|
|
- pars = append(pars, time.Now())
|
|
|
+ condition += ` AND art.activity_time_end < '` + time.Now().Format(utils.FormatDateTime) + `'`
|
|
|
+ //pars = append(pars, time.Now())
|
|
|
}
|
|
|
if state == 4 {
|
|
|
- condition += ` AND art.activity_time_end > ? `
|
|
|
- pars = append(pars, time.Now())
|
|
|
+ condition += ` AND art.activity_time_end > '` + time.Now().Format(utils.FormatDateTime) + `'`
|
|
|
+ //pars = append(pars, time.Now())
|
|
|
}
|
|
|
if keywords != "" {
|
|
|
keywords = "%" + keywords + "%"
|
|
@@ -360,7 +360,7 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
|
|
|
}
|
|
|
permissionShengji = strings.TrimRight(permissionShengji, ",")
|
|
|
conditionOr += ` OR ( art.customer_type_ids LIKE '%8%' AND art.chart_permission_name IN (` + permissionShengji + `)` + condition + `) `
|
|
|
- pars = append(pars, pars)
|
|
|
+ //pars = append(pars, pars)
|
|
|
}
|
|
|
//9:其他行业正式客户:前述所有正式客户以外的正式客户 查询处理
|
|
|
permissionZhengShiStr, errs := models.GetCompanyPermissionByUserZhengShi(user.CompanyId)
|
|
@@ -385,7 +385,7 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
|
|
|
permissionZhengShiStr = strings.Replace(permissionZhengShiStr, "(客观)", "", -1)
|
|
|
permissionZhengShiStr = strings.TrimRight(permissionZhengShiStr, ",")
|
|
|
conditionOr += ` OR ( art.customer_type_ids LIKE '%9%' AND art.chart_permission_name NOT IN (` + permissionZhengShiStr + `)` + condition + `) `
|
|
|
- pars = append(pars, pars)
|
|
|
+ //pars = append(pars, pars)
|
|
|
}
|
|
|
|
|
|
condition += conditionUser + conditionOr
|