change

controllers/book/book.go

@@ -50,7 +50,8 @@ func (c *BookController) GetBookList() {
 	bookType := c.GetString("bookType")
 	page, _ := c.GetInt("page")
 	pagesize, _ := c.GetInt("pagesize")
-	list, err := c.serv.GetBookList(bookType, caseIDs, page, pagesize)
+	name := c.GetString("name")
+	list, err := c.serv.GetBookList(bookType, name, caseIDs, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/book/book.go

@@ -25,25 +25,31 @@ func NewBookDAO(ctx *utils.Context) *BookDAO {
 	}
 }
 
-func (m *BookDAO) GetBookList(bookType, caseid string, page, pageSize int) ([]model.TaBook, error) {
+func (m *BookDAO) GetBookList(bookType, name, caseid string, page, pageSize int) ([]model.TaBook, error) {
 	var book []model.TaBook
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
-	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
 	if bookType != "" {
 		sql += ` and book_type_id = '` + bookType + `'`
 	}
+	if name != "" {
+		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
+	}
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&book)
 	return book, err
 
 }
-func (m *BookDAO) GetBookListCount(bookType, caseid string) (int, error) {
+func (m *BookDAO) GetBookListCount(bookType, name, caseid string) (int, error) {
 	var book []model.TaBook
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
-	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
 	if bookType != "" {
 		sql += ` and book_type_id = '` + bookType + `'`
 	}
+	if name != "" {
+		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
+	}
 	sql += ` order by create_date desc`
 	err := m.db.Sql(sql).Find(&book)
 	return len(book), err
@@ -198,5 +204,9 @@ func (m *BookDAO) AddChangeRecord(change model.TaInStockChange) error {
 	change.RecordId = utils.GetGUID()
 	_, err := m.db.Insert(change)
 	return err
+}
 
+// GetMineRecord 获取个人借阅记录
+func (m *BookDAO) GetMineRecord(page, pagesize int) ([]model.TaBookBorrowRecord, error) {
+	return nil, nil
 }

models/model/ta_book_borrow_record.go

@@ -11,6 +11,7 @@ type TaBookBorrowRecord struct {
 	CustomerName       string    `xorm:"VARCHAR(32)"`
 	CustomerPhone      string    `xorm:"VARCHAR(32)"`
 	ReserveDate        time.Time `xorm:"DATETIME"`
+	ReserveEndDate     time.Time `xorm:"DATETIME"`
 	BorrowDate         time.Time `xorm:"DATETIME"`
 	ReturnDate         time.Time `xorm:"DATETIME"`
 	EndDate            time.Time `xorm:"DATETIME"`

routers/wechat.go

@@ -123,5 +123,6 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		// 图书管理
 		beego.NSRouter("/book/recommend/:caseid", &book.BookController{}, "get:GetRecommendList"),
 		beego.NSRouter("/booktype/:caseid", &booktype.BooktypeController{}, "get:GetList"),
+		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
 	)
 }

service/book/book.go

@@ -40,16 +40,16 @@ func (s *BookServ) GetBookRecommendList(caseid string, page, pageSize int) (map[
 	}, nil
 }
 
-func (s *BookServ) GetBookList(bookType, caseid string, page, pageSize int) (map[string]interface{}, error) {
+func (s *BookServ) GetBookList(bookType, name, caseid string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	list, err := s.dao.GetBookList(bookType, caseid, page, pageSize)
+	list, err := s.dao.GetBookList(bookType, name, caseid, page, pageSize)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")
 	}
-	total, err := s.dao.GetBookListCount(bookType, caseid)
+	total, err := s.dao.GetBookListCount(bookType, name, caseid)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")