胡轶钦 6 years ago
parent
commit
5a286dbd01
5 changed files with 58 additions and 6 deletions
  1. 21
    0
      controllers/book/book.go
  2. 22
    0
      controllers/booktype/booktype.go
  3. 2
    2
      models/book/book.go
  4. 9
    0
      routers/common.go
  5. 4
    4
      service/book/book.go

+ 21
- 0
controllers/book/book.go View File

@@ -92,6 +92,27 @@ func (c *BookController) GetInStockChangeByBookId() {
92 92
 
93 93
 }
94 94
 
95
+func (c *BookController) SaveBook() {
96
+	book := model.TaBook{}
97
+	if err := c.ParseForm(&book); err != nil {
98
+		c.ResponseError(err)
99
+	}
100
+	if book.BookId == "" {
101
+		list, err := c.serv.AddBook(book)
102
+		if err != nil {
103
+			c.ResponseError(err)
104
+		}
105
+
106
+		c.ResponseJSON(list)
107
+	}
108
+	list, err := c.serv.EditBook(book)
109
+	if err != nil {
110
+		c.ResponseError(err)
111
+	}
112
+
113
+	c.ResponseJSON(list)
114
+}
115
+
95 116
 // AddChangeRecord 新增库存盘点
96 117
 func (c *BookController) AddChangeRecord() {
97 118
 	change := model.TaInStockChange{}

+ 22
- 0
controllers/booktype/booktype.go View File

@@ -2,6 +2,7 @@ package booktype
2 2
 
3 3
 import (
4 4
 	"spaceofcheng/services/controllers"
5
+	"spaceofcheng/services/models/model"
5 6
 	"spaceofcheng/services/service/booktype"
6 7
 )
7 8
 
@@ -38,3 +39,24 @@ func (c *BooktypeController) GetList() {
38 39
 
39 40
 	c.ResponseJSON(list)
40 41
 }
42
+
43
+func (c *BooktypeController) GetBookTypeById() {
44
+	typeId := c.GetString(":bookTypeId")
45
+	list, err := c.serv.GetBookTypeById(typeId)
46
+	if err != nil {
47
+		c.ResponseError(err)
48
+	}
49
+	c.ResponseJSON(list)
50
+}
51
+
52
+func (c *BooktypeController) SaveBookType() {
53
+	booktype := model.TaBookType{}
54
+	if err := c.ParseForm(&booktype); err != nil {
55
+		c.ResponseError(err)
56
+	}
57
+	newbooktype, err := c.serv.SaveBookType(booktype)
58
+	if err != nil {
59
+		c.ResponseError(err)
60
+	}
61
+	c.ResponseJSON(newbooktype)
62
+}

+ 2
- 2
models/book/book.go View File

@@ -86,7 +86,7 @@ func (m *BookDAO) AddBook(book model.TaBook) (*model.TaBook, error) {
86 86
 	_, err := m.db.Insert(book)
87 87
 	return &book, err
88 88
 }
89
-func (m *BookDAO) EditBook(book model.TaBook) error {
89
+func (m *BookDAO) EditBook(book model.TaBook) (*model.TaBook, error) {
90 90
 	var cols = []string{
91 91
 		"book_type_id",
92 92
 		"book_name",
@@ -97,7 +97,7 @@ func (m *BookDAO) EditBook(book model.TaBook) error {
97 97
 		"book_description",
98 98
 	}
99 99
 	_, err := m.db.Cols(cols...).Where("book_id = ?", book.BookId).Update(book)
100
-	return err
100
+	return &book, err
101 101
 }
102 102
 func (m *BookDAO) AddBookRecord(record model.TaBookBorrowRecord) (*model.TaBookBorrowRecord, error) {
103 103
 	record.BookBorrowRecordId = utils.GetGUID()

+ 9
- 0
routers/common.go View File

@@ -4,6 +4,7 @@ import (
4 4
 	"spaceofcheng/services/controllers"
5 5
 	"spaceofcheng/services/controllers/bodychecklist"
6 6
 	"spaceofcheng/services/controllers/book"
7
+	"spaceofcheng/services/controllers/booktype"
7 8
 	"spaceofcheng/services/controllers/calendar"
8 9
 	"spaceofcheng/services/controllers/card"
9 10
 	"spaceofcheng/services/controllers/cases"
@@ -352,10 +353,18 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
352 353
 		beego.NSRouter("/book/record", &book.BookController{}, "get:GetRecordList"),
353 354
 		beego.NSRouter("/book/instock/:bookId", &book.BookController{}, "get:GetInStockChangeByBookId"),
354 355
 		beego.NSRouter("/book/change", &book.BookController{}, "post:AddChangeRecord"),
356
+		beego.NSRouter("/book", &book.BookController{}, "post:SaveBook"),
357
+		beego.NSRouter("/book", &book.BookController{}, "put:SaveBook"),
355 358
 		beego.NSRouter("/book/borrow/:bookIds/:customerId", &book.BookController{}, "put:BorrowBook"),
356 359
 		beego.NSRouter("/book/return/:borrowIds", &book.BookController{}, "post:ReturnBook"),
357 360
 		beego.NSRouter("/book/return/:customerInfo", &book.BookController{}, "get:GetCustomerReturnList"),
358 361
 		beego.NSRouter("/book/customer/:customerInfo", &book.BookController{}, "put:GetCustomerByCustomerInfo"),
359 362
 		beego.NSRouter("/book/excel", &book.BookController{}, "post:ExcelInpuData"),
363
+
364
+		// booktype 图书类型管理
365
+		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "get:GetList"),
366
+		beego.NSRouter("/booktype/:bookTypeId", &booktype.BooktypeController{}, "get:GetBookTypeById"),
367
+		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "post:SaveBookType"),
368
+		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "put:SaveBookType"),
360 369
 	)
361 370
 }

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

@@ -84,13 +84,13 @@ func (s *BookServ) AddBook(book model.TaBook) (*model.TaBook, error) {
84 84
 	return newBook, err
85 85
 
86 86
 }
87
-func (s *BookServ) EditBook(book model.TaBook) error {
88
-	err := s.dao.EditBook(book)
87
+func (s *BookServ) EditBook(book model.TaBook) (*model.TaBook, error) {
88
+	editbook, err := s.dao.EditBook(book)
89 89
 	if err != nil {
90 90
 		utils.LogError("修改图书失败: " + err.Error())
91
-		return errors.New("修改图书失败")
91
+		return nil, errors.New("修改图书失败")
92 92
 	}
93
-	return nil
93
+	return editbook, nil
94 94
 }
95 95
 
96 96
 // GetMineRecord 获取个人借阅记录