From ba20394a101df9bfd807d640001dbfedd33bc546 Mon Sep 17 00:00:00 2001 From: giovanni Date: Tue, 27 Jan 2026 12:27:25 +0700 Subject: [PATCH 1/2] fix closing data produksi sales --- internal/common/repository/common.hpp.repository.go | 2 +- internal/modules/closings/services/closing.service.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/common/repository/common.hpp.repository.go b/internal/common/repository/common.hpp.repository.go index da4b1908..97ad3800 100644 --- a/internal/common/repository/common.hpp.repository.go +++ b/internal/common/repository/common.hpp.repository.go @@ -253,7 +253,7 @@ func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangI Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id"). Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs). Where("r.record_datetime <= ?", *endDate). - Where("mdp.delivery_date = ?", *startDate) + Where("mdp.delivery_date <= ?", *startDate) var totals struct { TotalPieces float64 diff --git a/internal/modules/closings/services/closing.service.go b/internal/modules/closings/services/closing.service.go index 5494a835..43042b9b 100644 --- a/internal/modules/closings/services/closing.service.go +++ b/internal/modules/closings/services/closing.service.go @@ -839,7 +839,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint // FeedUsedPerHead: feedUsedPerHead, } - chickenFlagNames := []string{string(utils.FlagPullet)} + chickenFlagNames := []string{string(utils.FlagPullet), string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling)} chickenSalesWeight, chickenSalesQty, chickenSalesPrice, err := s.Repository.SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(c.Context(), projectFlockKandangIDs, chickenFlagNames) if err != nil { s.Log.Errorf("Failed to fetch chicken sales data for project flock %d: %+v", projectFlockID, err) From ae7e53ac1f4a69d394b9f81cc199616a145ce29a Mon Sep 17 00:00:00 2001 From: giovanni Date: Tue, 27 Jan 2026 13:26:04 +0700 Subject: [PATCH 2/2] add flag layer --- internal/modules/closings/services/closing.service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/modules/closings/services/closing.service.go b/internal/modules/closings/services/closing.service.go index 43042b9b..ddc1a192 100644 --- a/internal/modules/closings/services/closing.service.go +++ b/internal/modules/closings/services/closing.service.go @@ -839,7 +839,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint // FeedUsedPerHead: feedUsedPerHead, } - chickenFlagNames := []string{string(utils.FlagPullet), string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling)} + chickenFlagNames := []string{string(utils.FlagPullet), string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling), string(utils.FlagLayer)} chickenSalesWeight, chickenSalesQty, chickenSalesPrice, err := s.Repository.SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(c.Context(), projectFlockKandangIDs, chickenFlagNames) if err != nil { s.Log.Errorf("Failed to fetch chicken sales data for project flock %d: %+v", projectFlockID, err)