费用

server/dao/commodity.go

@@ -5,7 +5,7 @@ import "server/global"
 type Commodity struct {
 	global.GVA_MODEL
 	Name           string         `json:"name" form:"name" gorm:"comment:商品名称"`
-	SupplierId     int            `json:"supplierId" form:"supplierId" gorm:"comment:商品id"`
+	SupplierId     int            `json:"supplierId" form:"supplierId" gorm:"comment:供应商id"`
 	Supplier       Supplier       `json:"supplier" form:"supplier" gorm:"foreignKey:SupplierId;references:id;"`
 	Genre          int            `json:"genre" form:"genre" gorm:"comment:商品类型id"`
 	CommodityGenre CommodityGenre `json:"commodityGenre" form:"commodityGenre" gorm:"foreignKey:Genre;references:id;"`
@@ -26,7 +26,6 @@ func QueryCommodityList(limit, offset int) (commodities []Commodity, total int64
 	// 创建db
 	db := global.GVA_DB.Model(&Commodity{})
 	// 如果有条件搜索 下方会自动创建搜索语句
-
 	err = db.Count(&total).Error
 	if err != nil {
 		return

server/dao/expenses.go

@@ -55,10 +55,11 @@ func QueryExpensesList(limit, offset, genre, name int, dayTime, monthTime, yearT
 	if err != nil {
 		return
 	}
-	err = db.Order("fee_time desc").Limit(limit).Offset(offset).Preload("SysUser").Preload("Department").Preload("ExpensesGenre").Find(&expenses).Error
+	err = db.Order("fee_time desc,created_at desc").Limit(limit).Offset(offset).Preload("SysUser").Preload("Department").Preload("ExpensesGenre").Find(&expenses).Error
 	return expenses, total, err
 }
 
+// QueryExpensesSumByPeople 查询
 func QueryExpensesSumByPeople(limit, offset, genre, name int, dayTime, monthTime, yearTime string) (results []ExpensesResult, total int64, err error) {
 	db := global.GVA_DB.Model(&Expenses{}).Select("reimburser,SUM(expenditure_amount) as expenditure_amount_sum,SUM(deposit_amount) as deposit_amount_sum,department_id")
 	// 如果有条件搜索 下方会自动创建搜索语句