Bläddra i källkod

分页+borrowStatus

胡轶钦 6 år sedan
förälder
incheckning
ef4877b8c6
2 ändrade filer med 9 tillägg och 6 borttagningar
  1. 3
    0
      models/book/book.go
  2. 6
    6
      service/book/book.go

+ 3
- 0
models/book/book.go Visa fil

165
 	if barcode != "" {
165
 	if barcode != "" {
166
 		sql += ` and b.book_barcode = '` + barcode + `'`
166
 		sql += ` and b.book_barcode = '` + barcode + `'`
167
 	}
167
 	}
168
+	if borrowStatus != models.BORROW_TYPE_RESERVE {
169
+		sql += ` and a.borrow_status in(0,1,2,3)`
170
+	}
168
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
171
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
169
 	beego.Error(sql)
172
 	beego.Error(sql)
170
 	err := m.db.Sql(sql).Find(&record)
173
 	err := m.db.Sql(sql).Find(&record)

+ 6
- 6
service/book/book.go Visa fil

33
 	if pageSize == 0 {
33
 	if pageSize == 0 {
34
 		pageSize = service.PAGENUM
34
 		pageSize = service.PAGENUM
35
 	}
35
 	}
36
-	if page == 0 {
36
+	if page <= 0 {
37
 		page = 1
37
 		page = 1
38
 	}
38
 	}
39
 	list, err := s.dao.GetBookRecommendList(caseid, page, pageSize)
39
 	list, err := s.dao.GetBookRecommendList(caseid, page, pageSize)
53
 	if pageSize == 0 {
53
 	if pageSize == 0 {
54
 		pageSize = service.PAGENUM
54
 		pageSize = service.PAGENUM
55
 	}
55
 	}
56
-	if page == 0 {
56
+	if page <= 0 {
57
 		page = 1
57
 		page = 1
58
 	}
58
 	}
59
 	list, err := s.dao.GetBookList(bookType, name, barcode, showzero, caseid, page, pageSize)
59
 	list, err := s.dao.GetBookList(bookType, name, barcode, showzero, caseid, page, pageSize)
133
 	if pageSize == 0 {
133
 	if pageSize == 0 {
134
 		pageSize = service.PAGENUM
134
 		pageSize = service.PAGENUM
135
 	}
135
 	}
136
-	if page == 0 {
136
+	if page <= 0 {
137
 		page = 1
137
 		page = 1
138
 	}
138
 	}
139
 	customer := s.ctx.Get("customer").(model.TaCustomer)
139
 	customer := s.ctx.Get("customer").(model.TaCustomer)
159
 	if pageSize == 0 {
159
 	if pageSize == 0 {
160
 		pageSize = service.PAGENUM
160
 		pageSize = service.PAGENUM
161
 	}
161
 	}
162
-	if page == 0 {
162
+	if page <= 0 {
163
 		page = 1
163
 		page = 1
164
 	}
164
 	}
165
 	list, err := s.dao.GetInStockChangeByBookId(bookId, page, pageSize)
165
 	list, err := s.dao.GetInStockChangeByBookId(bookId, page, pageSize)
339
 	if pageSize == 0 {
339
 	if pageSize == 0 {
340
 		pageSize = service.PAGENUM
340
 		pageSize = service.PAGENUM
341
 	}
341
 	}
342
-	if page == 0 {
342
+	if page <= 0 {
343
 		page = 1
343
 		page = 1
344
 	}
344
 	}
345
 	list, err := s.dao.GetCustomerReturnList(customerInfo, caseId, page, pageSize)
345
 	list, err := s.dao.GetCustomerReturnList(customerInfo, caseId, page, pageSize)
420
 	if pageSize == 0 {
420
 	if pageSize == 0 {
421
 		pageSize = service.PAGENUM
421
 		pageSize = service.PAGENUM
422
 	}
422
 	}
423
-	if page == 0 {
423
+	if page <= 0 {
424
 		page = 1
424
 		page = 1
425
 	}
425
 	}
426
 	list, err := s.dao.GetRecordList(borrowStatus, caseid, customerName, customerPhone, bookName, barcode, page, pageSize)
426
 	list, err := s.dao.GetRecordList(borrowStatus, caseid, customerName, customerPhone, bookName, barcode, page, pageSize)