Merge remote-tracking branch 'origin/master'

server/model/admin/request/qsh_monitor_data.go

@@ -8,4 +8,6 @@ import (
 type QshMonitorDataSearch struct {
 	admin.QshMonitorData
 	request.PageInfo
+	StartTime string `json:"start_time"`
+	EndTime   string `json:"end_time"`
 }

server/service/admin/qsh_monitor_data.go

@@ -60,6 +60,15 @@ func (qshMonitorDataService *QshMonitorDataService) GetQshMonitorDataInfoList(in
 	if info.TypeName != "" {
 		db = db.Where("type_name LIKE ?", "%"+info.TypeName+"%")
 	}
+	if info.ToiletId != 0 {
+		db = db.Where("toilet_id = ?", info.ToiletId)
+	}
+	if info.StartTime != "" {
+		db.Where("created_at >= ?", info.StartTime)
+	}
+	if info.EndTime != "" {
+		db.Where("created_at <= ?", info.EndTime)
+	}
 	err = db.Count(&total).Error
 	if err != nil {
 		return