上测试环境
This commit is contained in:
parent
bf18a6982c
commit
0d109c7a19
2
.idea/.gitignore
vendored
2
.idea/.gitignore
vendored
@ -6,3 +6,5 @@
|
|||||||
# Datasource local storage ignored files
|
# Datasource local storage ignored files
|
||||||
/dataSources/
|
/dataSources/
|
||||||
/dataSources.local.xml
|
/dataSources.local.xml
|
||||||
|
|
||||||
|
/conf
|
||||||
|
@ -85,9 +85,6 @@ func (p *ArtShowProvider) ShowList(ctx context.Context, req *artShow.ShowListReq
|
|||||||
if req.PageSize == 0 {
|
if req.PageSize == 0 {
|
||||||
req.Page = 10
|
req.Page = 10
|
||||||
}
|
}
|
||||||
if req.IsShow == 0 {
|
|
||||||
req.IsShow = m.ARTSHOW_INSIDE
|
|
||||||
}
|
|
||||||
res = new(artShow.ShowListRes)
|
res = new(artShow.ShowListRes)
|
||||||
err, res = service.ArtShowList(req)
|
err, res = service.ArtShowList(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -32,7 +32,9 @@ func ArtShowList(in *artShow.ShowListReq) (err error, total int64, out []*model.
|
|||||||
if in.StartTime != "" && in.EndTime != "" {
|
if in.StartTime != "" && in.EndTime != "" {
|
||||||
queryDB = queryDB.Where("convert(show_time, date) between ? and ?", in.StartTime, in.EndTime)
|
queryDB = queryDB.Where("convert(show_time, date) between ? and ?", in.StartTime, in.EndTime)
|
||||||
}
|
}
|
||||||
queryDB = queryDB.Where("is_show = ?", in.IsShow)
|
if in.IsShow != 0 {
|
||||||
|
queryDB = queryDB.Where("is_show = ?", in.IsShow)
|
||||||
|
}
|
||||||
|
|
||||||
err = queryDB.Count(&total).Error
|
err = queryDB.Count(&total).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user