From 50b86244a02a4c217fdb30cdbb0e0ed7b4d1a838 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Wed, 5 Aug 2026 12:25:37 +0300 Subject: [PATCH] Fix report generation --- core/db/methods/approval.go | 9 +++++---- core/typescore/approval.go | 20 +++++++++----------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/core/db/methods/approval.go b/core/db/methods/approval.go index ceb12cf..c1f5c97 100644 --- a/core/db/methods/approval.go +++ b/core/db/methods/approval.go @@ -56,7 +56,6 @@ func (u *ApprovalDB) GetApprovalsListFilteredDB(ctx context.Context, filter type LeftJoin("approval_topic_categories c ON c.id = t.category_id"). OrderBy("a.created_at DESC") - // Базовые фильтры if filter.Status != nil && *filter.Status != "" { q = q.Where(squirrel.Eq{"a.status": *filter.Status}) } @@ -66,11 +65,13 @@ func (u *ApprovalDB) GetApprovalsListFilteredDB(ctx context.Context, filter type if filter.DepartmentID != nil { q = q.Where(squirrel.Eq{"a.department_id": *filter.DepartmentID}) } + if filter.ID != nil { + q = q.Where(squirrel.Eq{"a.id": *filter.ID}) + } if filter.Content != nil && *filter.Content != "" { q = q.Where(squirrel.Like{"a.content": "%" + *filter.Content + "%"}) } - // Новые фильтры if filter.DateFrom != nil { q = q.Where(squirrel.GtOrEq{"a.created_at": *filter.DateFrom}) } @@ -554,12 +555,12 @@ func buildApprovalIdSubquery(role string, userID *uint64) squirrel.SelectBuilder case "additional_approver": return q. - Join("approval_additional_approvers aaa ON aaa.approval_id = a.id"). + Join(dbcoretablenames.TableNameApprovalAdditionalApprovers.ToString() + " aaa ON aaa.approval_id = a.id"). Where(squirrel.Eq{"aaa.approver_id": userID}) case "additional_observer": return q. - Join("approval_observers ao ON ao.approval_id = a.id"). + Join(dbcoretablenames.TableNameApprovalAdditionalObservers.ToString() + " ao ON ao.approval_id = a.id"). Where(squirrel.Eq{"ao.user_id": userID}) case "observer": diff --git a/core/typescore/approval.go b/core/typescore/approval.go index b65982a..7b990ff 100644 --- a/core/typescore/approval.go +++ b/core/typescore/approval.go @@ -22,17 +22,15 @@ func (status ApprovalStatus) String() string { // ApprovalFilter — расширенный фильтр для списка заявок type ApprovalFilter struct { - // Базовые фильтры - Status *string `json:"status,omitempty"` - InitiatorID *uint64 `json:"initiator_id,omitempty"` - DepartmentID *uint64 `json:"department_id,omitempty"` - Content *string `json:"content,omitempty"` - - // Новые фильтры - DateFrom *time.Time `json:"date_from,omitempty"` - DateTo *time.Time `json:"date_to,omitempty"` - CategoryIDs []uint64 `json:"category_ids,omitempty"` // множественный выбор категорий - TopicIDs []uint64 `json:"topic_ids,omitempty"` // множественный выбор тем + ID *uint64 `json:"id"` + Status *string `json:"status,omitempty"` + InitiatorID *uint64 `json:"initiator_id,omitempty"` + DepartmentID *uint64 `json:"department_id,omitempty"` + Content *string `json:"content,omitempty"` + DateFrom *time.Time `json:"date_from,omitempty"` + DateTo *time.Time `json:"date_to,omitempty"` + CategoryIDs []uint64 `json:"category_ids,omitempty"` // множественный выбор категорий + TopicIDs []uint64 `json:"topic_ids,omitempty"` // множественный выбор тем } // Approval — заявка на согласование. -- 2.43.0