typeList

models/booktype/booktype.go

@@ -8,8 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego"
-
 	"github.com/go-xorm/xorm"
 )
 
@@ -35,34 +33,34 @@ type BookTypeList struct {
 func (m *BooktypeDAO) GetBookTypeList(caseid string, page, pageSize int) ([]model.TaBookType, error) {
 	var booktype []model.TaBookType
 	// sql := `select a.*,
-	// (SELECT COUNT(1)FROM ta_book b where a.book_type_id = b.book_type_id AND b.status = '` + strconv.Itoa(models.STATUS_NORMAL) + `') as book_count where
+	// (SELECT COUNT(1)FROM ta_book b where a.book_type_id = b.book_type_id AND b.status = '` + strconv.Itoa(models.STATUS_NORMAL) + `') as book_count
+	// where
 	// a.status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
 	// and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
 	// order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-
 	sql := `SELECT
-					a.*, b.book_count
-				FROM
-					ta_book_type a
-				LEFT JOIN (
-					SELECT
-						book_type_id,
-						count(1) AS book_count
-					FROM
-						ta_book
-					WHERE
-						STATUS = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
-					GROUP BY
-						book_type_id
-				) b ON a.book_type_id = b.book_type_id
-				WHERE
-					a. STATUS = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
-				AND a.case_id IN (
-					'` + strings.Replace(caseid, ",", "','", -1) + `'
-				)
-				ORDER BY
-					a.create_date DESC
-				LIMIT ` + strconv.Itoa((page-1)*pageSize) + `,` + strconv.Itoa(pageSize)
+	a.*, b.book_count
+FROM
+	ta_book_type a
+LEFT JOIN (
+	SELECT
+		book_type_id,
+		count(1) AS book_count
+	FROM
+		ta_book
+	WHERE
+		STATUS = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
+	GROUP BY
+		book_type_id
+) b ON a.book_type_id = b.book_type_id
+WHERE
+	a. STATUS = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
+AND a.case_id IN (
+	'` + strings.Replace(caseid, ",", "','", -1) + `'
+)
+ORDER BY
+	a.create_date DESC
+LIMIT ` + strconv.Itoa((page-1)*pageSize) + `,` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&booktype)
 	return booktype, err
 }
@@ -70,7 +68,6 @@ func (m *BooktypeDAO) GetBookTypeListCount(caseid string) (int, error) {
 	var booktype []model.TaBookType
 	sql := `select * from ta_book_type where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
 	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
-	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&booktype)
 	return len(booktype), err
 }