From 83aa23f67780c60d64d2e9d4c238bea8bb2c220c Mon Sep 17 00:00:00 2001 From: giovanni Date: Fri, 8 May 2026 15:04:54 +0700 Subject: [PATCH] add response excess day and week --- .../modules/production/recordings/dto/recording.dto.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/modules/production/recordings/dto/recording.dto.go b/internal/modules/production/recordings/dto/recording.dto.go index 6eb39544..b24bfd68 100644 --- a/internal/modules/production/recordings/dto/recording.dto.go +++ b/internal/modules/production/recordings/dto/recording.dto.go @@ -74,6 +74,8 @@ type RecordingRelationDTO struct { ProjectFlock RecordingProjectFlockDTO `json:"project_flock"` RecordDatetime time.Time `json:"record_datetime"` Day int `json:"day"` + Week int `json:"week"` + ExcessDays int `json:"excess_days"` TotalDepletionQty float64 `json:"total_depletion_qty"` TotalDepletionCumQty float64 `json:"total_depletion_cum_qty"` CumDepletionRate float64 `json:"cum_depletion_rate"` @@ -270,11 +272,15 @@ func toRecordingRelationDTO(e entity.Recording) RecordingRelationDTO { latestApproval = snapshot } + day := intValue(e.Day) + return RecordingRelationDTO{ Id: e.Id, ProjectFlock: toRecordingProjectFlockDTO(e), RecordDatetime: e.RecordDatetime, - Day: intValue(e.Day), + Day: day, + Week: day / 7, + ExcessDays: day % 7, TotalDepletionQty: floatValue(e.TotalDepletionQty), TotalDepletionCumQty: floatValue(e.TotalDepletionCumQty), CumDepletionRate: roundFloatValue(e.CumDepletionRate, 2),