Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

models/book/book.go

@@ -246,14 +246,32 @@ func (m *BookDAO) AddChangeRecord(change model.TaInStockChange) error {
 	return err
 }
 
+// BookBorrowRecord 图书借阅记录
+type BookBorrowRecord struct {
+	model.TaBookBorrowRecord `xorm:"extends"`
+	BookName                 string
+	BookImg                  string
+	CaseName                 string
+}
+
 // GetMineRecord 获取个人借阅记录
-func (m *BookDAO) GetMineRecord(customerid, status string, page, pagesize int) ([]model.TaBookBorrowRecord, error) {
-	var records []model.TaBookBorrowRecord
-	var db = m.db.Where("customer_id=?", customerid)
+func (m *BookDAO) GetMineRecord(customerid, status string, page, pagesize int) ([]BookBorrowRecord, error) {
+	var records []BookBorrowRecord
+	sql := `select a.*,b.book_name,b.book_img,c.case_name from ta_book_borrow_record a 
+	inner join sys_case c on a.case_id=c.case_id 
+	left join ta_book b on a.book_id=b.book_id 
+	where a.customer_id=? `
 	if status != "" {
-		db.And("borrow_status=?", status)
+		sql += ` and a.borrow_status in ('` + strings.Replace(status, ",", "','", -1) + `')`
+	}
+	sql += ` order by a.borrow_status asc`
+	if status == "4" {
+		sql += `,a.reserve_date asc`
+	} else {
+		sql += `,a.end_date asc`
 	}
-	err := db.Limit(pagesize, pagesize*(page-1)).Find(&records)
+	sql += ` limit ` + strconv.Itoa((page-1)*pagesize) + `, ` + strconv.Itoa(pagesize)
+	err := m.db.Sql(sql, customerid).Find(&records)
 	return records, err
 }
 
@@ -262,7 +280,7 @@ func (m *BookDAO) GetMineRecordCount(customerid, status string) (int, error) {
 	var records []model.TaBookBorrowRecord
 	var db = m.db.Where("customer_id=?", customerid)
 	if status != "" {
-		db.And("borrow_status=?", status)
+		db.And("borrow_status in ('" + strings.Replace(status, ",", "','", -1) + "')")
 	}
 	err := db.Find(&records)
 	return len(records), err