wangfei vor 6 Jahren
Ursprung
Commit
47614821ae
4 geänderte Dateien mit 75 neuen und 0 gelöschten Zeilen
  1. 47
    0
      models/book/book.go
  2. 1
    0
      models/constant.go
  3. 1
    0
      models/model/ta_book_borrow_record.go
  4. 26
    0
      service/book/book.go

+ 47
- 0
models/book/book.go Datei anzeigen

@@ -157,6 +157,53 @@ func (m *BookDAO) GetBookRecommendList(caseid string, page, pageSize int) ([]mod
157 157
 	return book, err
158 158
 }
159 159
 
160
+type InStockChange struct {
161
+	model.TaInStockChange `xorm:"extends"`
162
+	RealName              string
163
+	BookName              string
164
+	LeftNum               int
165
+}
166
+
167
+func (m *BookDAO) GetInStockChangeByBookId(bookId string, page, pageSize int) ([]InStockChange, error) {
168
+	var change []InStockChange
169
+	sql := `SELECT
170
+	a.*,
171
+	b.book_name,
172
+	b.left_num,
173
+	c.real_name
174
+FROM
175
+	ta_in_stock_change a
176
+	INNER JOIN ta_book b ON a.book_id = b.book_id
177
+	INNER JOIN sys_user c on a.change_user = c.user_id
178
+	WHERE a.book_id = '` + bookId + `'`
179
+	sql += ` order by a.change_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
180
+	err := m.db.Sql(sql).Find(&change)
181
+	return change, err
182
+}
183
+
184
+func (m *BookDAO) GetInStockChangeByBookIdCount(bookId string) (int, error) {
185
+	var change []InStockChange
186
+	sql := `SELECT
187
+	a.*,
188
+	b.book_name,
189
+	b.left_num,
190
+	c.real_name
191
+FROM
192
+	ta_in_stock_change a
193
+	INNER JOIN ta_book b ON a.book_id = b.book_id
194
+	INNER JOIN sys_user c on a.change_user = c.user_id
195
+	WHERE a.book_id = '` + bookId + `'`
196
+	err := m.db.Sql(sql).Find(&change)
197
+	return len(change), err
198
+}
199
+
200
+func (m *BookDAO) AddChangeRecord(change model.TaInStockChange) error {
201
+	change.ChangeDate = time.Now()
202
+	change.RecordId = utils.GetGUID()
203
+	_, err := m.db.Insert(change)
204
+	return err
205
+}
206
+
160 207
 // GetMineRecord 获取个人借阅记录
161 208
 func (m *BookDAO) GetMineRecord(customerid string, page, pagesize int) ([]model.TaBookBorrowRecord, error) {
162 209
 	var records []model.TaBookBorrowRecord

+ 1
- 0
models/constant.go Datei anzeigen

@@ -260,6 +260,7 @@ const (
260 260
 	BORROW_TYPE_RETURN   = "return"
261 261
 	BORROW_TYPE_EXPIRE   = "expire"
262 262
 	BORROW_TYPE_LATE     = "late"
263
+	BORROW_TYPE_CANCEL   = "cancel"
263 264
 )
264 265
 
265 266
 // 是否推荐

+ 1
- 0
models/model/ta_book_borrow_record.go Datei anzeigen

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

+ 26
- 0
service/book/book.go Datei anzeigen

@@ -111,3 +111,29 @@ func (s *BookServ) GetMineRecord(page, pageSize int) (map[string]interface{}, er
111 111
 		"page":     page,
112 112
 	}, nil
113 113
 }
114
+
115
+func (s *BookServ) GetInStockChangeByBookId(bookId string, page, pageSize int) (map[string]interface{}, error) {
116
+	if pageSize == 0 {
117
+		pageSize = service.PAGENUM
118
+	}
119
+	list, err := s.dao.GetInStockChangeByBookId(bookId, page, pageSize)
120
+	if err != nil {
121
+		utils.LogError("获取库存盘点列表失败: " + err.Error())
122
+		return nil, errors.New("获取库存盘点列表失败")
123
+	}
124
+	total, err := s.dao.GetInStockChangeByBookIdCount(bookId)
125
+	if err != nil {
126
+		utils.LogError("获取库存盘点列表失败: " + err.Error())
127
+		return nil, errors.New("获取库存盘点列表失败")
128
+	}
129
+	return map[string]interface{}{
130
+		"list":     list,
131
+		"pageSize": pageSize,
132
+		"pagenum":  total,
133
+		"page":     page,
134
+	}, nil
135
+}
136
+
137
+// func (s *BookServ)AddChangeRecord(change model.TaInStockChange)error{
138
+
139
+// }