mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-20 01:34:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

transaction statistics api supports data of all date

Browse Source
This commit is contained in:
MaysWind
2021-01-21 00:08:47 +08:00
parent 4179cc00e2
commit 1f829f0225
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/transactions.go
+17 -3
View File
@@ -1032,11 +1032,25 @@ func (s *TransactionService) GetAccountsAndCategoriesTotalIncomeAndExpense(uid i
return nil, errs.ErrUserIdInvalid return nil, errs.ErrUserIdInvalid
} }
startTransactionTime := utils.GetMinTransactionTimeFromUnixTime(startUnixTime) condition := "uid=? AND deleted=? AND (type=? OR type=?)"
endTransactionTime := utils.GetMaxTransactionTimeFromUnixTime(endUnixTime) conditionParams := make([]interface{}, 0, 8)
conditionParams = append(conditionParams, uid)
conditionParams = append(conditionParams, false)
conditionParams = append(conditionParams, models.TRANSACTION_DB_TYPE_INCOME)
conditionParams = append(conditionParams, models.TRANSACTION_DB_TYPE_EXPENSE)
if startUnixTime > 0 {
condition = condition + " AND transaction_time>=?"
conditionParams = append(conditionParams, utils.GetMinTransactionTimeFromUnixTime(startUnixTime))
}
if endUnixTime > 0 {
condition = condition + " AND transaction_time<=?"
conditionParams = append(conditionParams, utils.GetMaxTransactionTimeFromUnixTime(endUnixTime))
}
var transactionTotalAmounts []*models.Transaction var transactionTotalAmounts []*models.Transaction
err := s.UserDataDB(uid).Select("uid, category_id, account_id, SUM(amount) as amount").Where("uid=? AND deleted=? AND (type=? OR type=?) AND transaction_time>=? AND transaction_time<=?", uid, false, models.TRANSACTION_DB_TYPE_INCOME, models.TRANSACTION_DB_TYPE_EXPENSE, startTransactionTime, endTransactionTime).GroupBy("category_id, account_id").Find(&transactionTotalAmounts) err := s.UserDataDB(uid).Select("uid, category_id, account_id, SUM(amount) as amount").Where(condition, conditionParams...).GroupBy("category_id, account_id").Find(&transactionTotalAmounts)
if err != nil { if err != nil {
return nil, err return nil, err