mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 05:21:57 +00:00
Merge branch 'fix/day-record' into 'development'
add response excess day and week See merge request mbugroup/lti-api!523
This commit is contained in:
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user