胡轶钦 6 years ago
parent
commit
6fc5408307

+ 2
- 1
controllers/book/book.go View File

50
 	bookType := c.GetString("bookType")
50
 	bookType := c.GetString("bookType")
51
 	page, _ := c.GetInt("page")
51
 	page, _ := c.GetInt("page")
52
 	pagesize, _ := c.GetInt("pagesize")
52
 	pagesize, _ := c.GetInt("pagesize")
53
-	list, err := c.serv.GetBookList(bookType, caseIDs, page, pagesize)
53
+	name := c.GetString("name")
54
+	list, err := c.serv.GetBookList(bookType, name, caseIDs, page, pagesize)
54
 	if err != nil {
55
 	if err != nil {
55
 		c.ResponseError(err)
56
 		c.ResponseError(err)
56
 	}
57
 	}

+ 14
- 4
models/book/book.go View File

25
 	}
25
 	}
26
 }
26
 }
27
 
27
 
28
-func (m *BookDAO) GetBookList(bookType, caseid string, page, pageSize int) ([]model.TaBook, error) {
28
+func (m *BookDAO) GetBookList(bookType, name, caseid string, page, pageSize int) ([]model.TaBook, error) {
29
 	var book []model.TaBook
29
 	var book []model.TaBook
30
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
30
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
31
-	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
31
+	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
32
 	if bookType != "" {
32
 	if bookType != "" {
33
 		sql += ` and book_type_id = '` + bookType + `'`
33
 		sql += ` and book_type_id = '` + bookType + `'`
34
 	}
34
 	}
35
+	if name != "" {
36
+		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
37
+	}
35
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
38
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
36
 	err := m.db.Sql(sql).Find(&book)
39
 	err := m.db.Sql(sql).Find(&book)
37
 	return book, err
40
 	return book, err
38
 
41
 
39
 }
42
 }
40
-func (m *BookDAO) GetBookListCount(bookType, caseid string) (int, error) {
43
+func (m *BookDAO) GetBookListCount(bookType, name, caseid string) (int, error) {
41
 	var book []model.TaBook
44
 	var book []model.TaBook
42
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
45
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
43
-	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
46
+	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
44
 	if bookType != "" {
47
 	if bookType != "" {
45
 		sql += ` and book_type_id = '` + bookType + `'`
48
 		sql += ` and book_type_id = '` + bookType + `'`
46
 	}
49
 	}
50
+	if name != "" {
51
+		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
52
+	}
47
 	sql += ` order by create_date desc`
53
 	sql += ` order by create_date desc`
48
 	err := m.db.Sql(sql).Find(&book)
54
 	err := m.db.Sql(sql).Find(&book)
49
 	return len(book), err
55
 	return len(book), err
198
 	change.RecordId = utils.GetGUID()
204
 	change.RecordId = utils.GetGUID()
199
 	_, err := m.db.Insert(change)
205
 	_, err := m.db.Insert(change)
200
 	return err
206
 	return err
207
+}
201
 
208
 
209
+// GetMineRecord 获取个人借阅记录
210
+func (m *BookDAO) GetMineRecord(page, pagesize int) ([]model.TaBookBorrowRecord, error) {
211
+	return nil, nil
202
 }
212
 }

+ 1
- 0
models/model/ta_book_borrow_record.go View File

11
 	CustomerName       string    `xorm:"VARCHAR(32)"`
11
 	CustomerName       string    `xorm:"VARCHAR(32)"`
12
 	CustomerPhone      string    `xorm:"VARCHAR(32)"`
12
 	CustomerPhone      string    `xorm:"VARCHAR(32)"`
13
 	ReserveDate        time.Time `xorm:"DATETIME"`
13
 	ReserveDate        time.Time `xorm:"DATETIME"`
14
+	ReserveEndDate     time.Time `xorm:"DATETIME"`
14
 	BorrowDate         time.Time `xorm:"DATETIME"`
15
 	BorrowDate         time.Time `xorm:"DATETIME"`
15
 	ReturnDate         time.Time `xorm:"DATETIME"`
16
 	ReturnDate         time.Time `xorm:"DATETIME"`
16
 	EndDate            time.Time `xorm:"DATETIME"`
17
 	EndDate            time.Time `xorm:"DATETIME"`

+ 1
- 0
routers/wechat.go View File

123
 		// 图书管理
123
 		// 图书管理
124
 		beego.NSRouter("/book/recommend/:caseid", &book.BookController{}, "get:GetRecommendList"),
124
 		beego.NSRouter("/book/recommend/:caseid", &book.BookController{}, "get:GetRecommendList"),
125
 		beego.NSRouter("/booktype/:caseid", &booktype.BooktypeController{}, "get:GetList"),
125
 		beego.NSRouter("/booktype/:caseid", &booktype.BooktypeController{}, "get:GetList"),
126
+		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
126
 	)
127
 	)
127
 }
128
 }

+ 3
- 3
service/book/book.go View File

40
 	}, nil
40
 	}, nil
41
 }
41
 }
42
 
42
 
43
-func (s *BookServ) GetBookList(bookType, caseid string, page, pageSize int) (map[string]interface{}, error) {
43
+func (s *BookServ) GetBookList(bookType, name, caseid string, page, pageSize int) (map[string]interface{}, error) {
44
 	if pageSize == 0 {
44
 	if pageSize == 0 {
45
 		pageSize = service.PAGENUM
45
 		pageSize = service.PAGENUM
46
 	}
46
 	}
47
-	list, err := s.dao.GetBookList(bookType, caseid, page, pageSize)
47
+	list, err := s.dao.GetBookList(bookType, name, caseid, page, pageSize)
48
 	if err != nil {
48
 	if err != nil {
49
 		utils.LogError("获取图书列表失败: " + err.Error())
49
 		utils.LogError("获取图书列表失败: " + err.Error())
50
 		return nil, errors.New("获取图书列表失败")
50
 		return nil, errors.New("获取图书列表失败")
51
 	}
51
 	}
52
-	total, err := s.dao.GetBookListCount(bookType, caseid)
52
+	total, err := s.dao.GetBookListCount(bookType, name, caseid)
53
 	if err != nil {
53
 	if err != nil {
54
 		utils.LogError("获取图书列表失败: " + err.Error())
54
 		utils.LogError("获取图书列表失败: " + err.Error())
55
 		return nil, errors.New("获取图书列表失败")
55
 		return nil, errors.New("获取图书列表失败")