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

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="D:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/book/book.go

@@ -51,9 +51,13 @@ func (c *BookController) GetBookList() {
 		cases := c.Context.Get("cases").([]model.SysUserCase)
 		caseIDs = c.GetCaseIDs(cases)
 	}
-	bookType := c.GetString("bookType")
+	bookType := c.GetString("booktype")
 	barcode := c.GetString("barcode")
 	page, _ := c.GetInt("page")
+	if page < 1 {
+		page = 1
+	}
+
 	pagesize, _ := c.GetInt("pagesize")
 	name := c.GetString("name")
 	showzero := c.GetString("showzero")

models/book/book.go

@@ -39,7 +39,7 @@ func (m *BookDAO) GetBookList(bookType, name, barcode, showzero, caseid string,
 		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
 	}
 	if barcode != "" {
-		sql += ` and barcode = '` + barcode + `'`
+		sql += ` and book_barcode = '` + barcode + `'`
 	}
 	if showzero == "0" {
 		sql += ` and left_num>0`
@@ -57,7 +57,7 @@ func (m *BookDAO) GetBookListCount(bookType, name, showzero, barcode, caseid str
 		sql += ` and book_type_id = '` + bookType + `'`
 	}
 	if barcode != "" {
-		sql += ` and barcode = '` + barcode + `'`
+		sql += ` and book_barcode = '` + barcode + `'`
 	}
 	if name != "" {
 		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
@@ -482,6 +482,7 @@ func (m *BookDAO) DeleteBook(bookId string) error {
 	var cols = []string{
 		"status",
 	}
+
 	_, err := m.db.Cols(cols...).Where("book_id = ?", book.BookId).Update(book)
 	return err
 }

routers/common.go

@@ -362,7 +362,7 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/book/customer/:customerInfo", &book.BookController{}, "put:GetCustomerByCustomerInfo"),
 		beego.NSRouter("/book/excel", &book.BookController{}, "post:ExcelInpuData"),
 		beego.NSRouter("/book/cancel/:recordId", &book.BookController{}, "put:CancelReserve"),
-		beego.NSRouter("/book/:recordId", &book.BookController{}, "delete:DeleteBook"),
+		beego.NSRouter("/book/:bookId", &book.BookController{}, "delete:DeleteBook"),
 
 		// booktype 图书类型管理
 		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "get:GetList"),