|
@@ -140,20 +140,48 @@ func (this *UserReadRecordController) List() {
|
|
|
pars = append(pars, false)
|
|
|
}
|
|
|
if registerStartDate != "" {
|
|
|
- condition += " AND u.register_time>? "
|
|
|
- pars = append(pars, registerStartDate)
|
|
|
+ registerStartTime, er := time.Parse(utils.FormatDate, registerStartDate)
|
|
|
+ if er != nil {
|
|
|
+ br.Msg = "日期格式有误"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ condition += " AND u.register_time>=? "
|
|
|
+ registerStartDateStr := registerStartTime.Format(utils.FormatDateTime)
|
|
|
+ pars = append(pars, registerStartDateStr)
|
|
|
}
|
|
|
if registerEndDate != "" {
|
|
|
- condition += " AND u.register_time<? "
|
|
|
- pars = append(pars, registerEndDate)
|
|
|
+ registerEndTime, er := time.Parse(utils.FormatDate, registerEndDate)
|
|
|
+ if er != nil {
|
|
|
+ br.Msg = "日期格式有误"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ condition += " AND u.register_time<=? "
|
|
|
+ // 结束时间包含今天
|
|
|
+ registerEndTime = registerEndTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
|
|
+ registerEndDateStr := registerEndTime.Format(utils.FormatDateTime)
|
|
|
+ pars = append(pars, registerEndDateStr)
|
|
|
}
|
|
|
if createStartDate != "" {
|
|
|
- condition += " AND u.create_time>? "
|
|
|
- pars = append(pars, createStartDate)
|
|
|
+ createStartTime, er := time.Parse(utils.FormatDate, createStartDate)
|
|
|
+ if er != nil {
|
|
|
+ br.Msg = "日期格式有误"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ condition += " AND u.create_time>=? "
|
|
|
+ createStartDateStr := createStartTime.Format(utils.FormatDateTime)
|
|
|
+ pars = append(pars, createStartDateStr)
|
|
|
}
|
|
|
if createEndDate != "" {
|
|
|
- condition += " AND u.create_time<? "
|
|
|
- pars = append(pars, createEndDate)
|
|
|
+ createEndTime, er := time.Parse(utils.FormatDate, createEndDate)
|
|
|
+ if er != nil {
|
|
|
+ br.Msg = "日期格式有误"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ condition += " AND u.create_time<=? "
|
|
|
+ // 结束时间包含今天
|
|
|
+ createEndTime = createEndTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
|
|
+ createEndDateStr := createEndTime.Format(utils.FormatDateTime)
|
|
|
+ pars = append(pars, createEndDateStr)
|
|
|
}
|
|
|
if pageSize <= 0 {
|
|
|
pageSize = utils.PageSize20
|