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

Fix the bug that no transaction would display when all date range in categorical analysis is selected

Browse Source
This commit is contained in:
MaysWind
2024-06-09 01:30:41 +08:00
parent c5f9e276b4
commit 1489854444
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/transactions.go
+20 -20
View File
@@ -1101,14 +1101,19 @@ func (s *TransactionService) GetAccountsAndCategoriesTotalIncomeAndExpense(c *co
} }
clientLocation := time.FixedZone("Client Timezone", int(utcOffset)*60) clientLocation := time.FixedZone("Client Timezone", int(utcOffset)*60)
startLocalDateTime := utils.FormatUnixTimeToNumericLocalDateTime(startUnixTime, clientLocation) var startLocalDateTime, endLocalDateTime, startTransactionTime, endTransactionTime int64
endLocalDateTime := utils.FormatUnixTimeToNumericLocalDateTime(endUnixTime, clientLocation)
startUnixTime = utils.GetMinUnixTimeWithSameLocalDateTime(startUnixTime, utcOffset) if startUnixTime > 0 {
endUnixTime = utils.GetMaxUnixTimeWithSameLocalDateTime(endUnixTime, utcOffset) startLocalDateTime = utils.FormatUnixTimeToNumericLocalDateTime(startUnixTime, clientLocation)
startUnixTime = utils.GetMinUnixTimeWithSameLocalDateTime(startUnixTime, utcOffset)
startTransactionTime = utils.GetMinTransactionTimeFromUnixTime(startUnixTime)
}
startTransactionTime := utils.GetMinTransactionTimeFromUnixTime(startUnixTime) if endUnixTime > 0 {
endTransactionTime := utils.GetMaxTransactionTimeFromUnixTime(endUnixTime) endLocalDateTime = utils.FormatUnixTimeToNumericLocalDateTime(endUnixTime, clientLocation)
endUnixTime = utils.GetMaxUnixTimeWithSameLocalDateTime(endUnixTime, utcOffset)
endTransactionTime = utils.GetMaxTransactionTimeFromUnixTime(endUnixTime)
}
condition := "uid=? AND deleted=? AND (type=? OR type=?)" condition := "uid=? AND deleted=? AND (type=? OR type=?)"
conditionParams := make([]any, 0, 4) conditionParams := make([]any, 0, 4)
@@ -1117,33 +1122,28 @@ func (s *TransactionService) GetAccountsAndCategoriesTotalIncomeAndExpense(c *co
conditionParams = append(conditionParams, models.TRANSACTION_DB_TYPE_INCOME) conditionParams = append(conditionParams, models.TRANSACTION_DB_TYPE_INCOME)
conditionParams = append(conditionParams, models.TRANSACTION_DB_TYPE_EXPENSE) conditionParams = append(conditionParams, models.TRANSACTION_DB_TYPE_EXPENSE)
if startUnixTime > 0 {
condition = condition + " AND transaction_time>=?"
}
if endUnixTime > 0 {
condition = condition + " AND transaction_time<=?"
}
minTransactionTime := startTransactionTime minTransactionTime := startTransactionTime
maxTransactionTime := endTransactionTime maxTransactionTime := endTransactionTime
var allTransactions []*models.Transaction var allTransactions []*models.Transaction
for maxTransactionTime > 0 { for maxTransactionTime >= 0 {
var transactions []*models.Transaction var transactions []*models.Transaction
finalCondition := condition
finalConditionParams := make([]any, 0, 6) finalConditionParams := make([]any, 0, 6)
finalConditionParams = append(finalConditionParams, conditionParams...) finalConditionParams = append(finalConditionParams, conditionParams...)
if startUnixTime > 0 { if minTransactionTime > 0 {
finalCondition = finalCondition + " AND transaction_time>=?"
finalConditionParams = append(finalConditionParams, minTransactionTime) finalConditionParams = append(finalConditionParams, minTransactionTime)
} }
if endUnixTime > 0 { if maxTransactionTime > 0 {
finalCondition = finalCondition + " AND transaction_time<=?"
finalConditionParams = append(finalConditionParams, maxTransactionTime) finalConditionParams = append(finalConditionParams, maxTransactionTime)
} }
err := s.UserDataDB(uid).NewSession(c).Select("category_id, account_id, transaction_time, timezone_utc_offset, amount").Where(condition, finalConditionParams...).Limit(pageCountForLoadTransactionAmounts, 0).OrderBy("transaction_time desc").Find(&transactions) err := s.UserDataDB(uid).NewSession(c).Select("category_id, account_id, transaction_time, timezone_utc_offset, amount").Where(finalCondition, finalConditionParams...).Limit(pageCountForLoadTransactionAmounts, 0).OrderBy("transaction_time desc").Find(&transactions)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -1152,7 +1152,7 @@ func (s *TransactionService) GetAccountsAndCategoriesTotalIncomeAndExpense(c *co
allTransactions = append(allTransactions, transactions...) allTransactions = append(allTransactions, transactions...)
if len(transactions) < pageCountForLoadTransactionAmounts { if len(transactions) < pageCountForLoadTransactionAmounts {
maxTransactionTime = 0 maxTransactionTime = -1
break break
} }
@@ -1171,7 +1171,7 @@ func (s *TransactionService) GetAccountsAndCategoriesTotalIncomeAndExpense(c *co
localDateTime := utils.FormatUnixTimeToNumericLocalDateTime(utils.GetUnixTimeFromTransactionTime(transaction.TransactionTime), timeZone) localDateTime := utils.FormatUnixTimeToNumericLocalDateTime(utils.GetUnixTimeFromTransactionTime(transaction.TransactionTime), timeZone)
if localDateTime < startLocalDateTime || localDateTime > endLocalDateTime { if (startLocalDateTime > 0 && localDateTime < startLocalDateTime) || (endLocalDateTime > 0 && localDateTime > endLocalDateTime) {
continue continue
} }