mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
Merge branch 'fix/LSS416' into 'development'
[FIX][BE]: fix data produksi not show response See merge request mbugroup/lti-api!219
This commit is contained in:
@@ -98,26 +98,26 @@ type ClosingEggSalesDTO struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type ClosingPerformanceDTO struct {
|
type ClosingPerformanceDTO struct {
|
||||||
Depletion float64 `json:"depletion"`
|
Depletion float64 `json:"depletion"`
|
||||||
Age float64 `json:"age_day"`
|
Age float64 `json:"age_day"`
|
||||||
MortalityStd float64 `json:"mor_std"`
|
MortalityStd float64 `json:"mor_std"`
|
||||||
MortalityAct float64 `json:"mor_act"`
|
MortalityAct float64 `json:"mor_act"`
|
||||||
DeffMortality float64 `json:"mor_diff"`
|
DeffMortality float64 `json:"mor_diff"`
|
||||||
FcrStd float64 `json:"fcr_std"`
|
FcrStd float64 `json:"fcr_std"`
|
||||||
FcrAct float64 `json:"fcr_act"`
|
FcrAct float64 `json:"fcr_act"`
|
||||||
DeffFcr float64 `json:"fcr_diff"`
|
DeffFcr float64 `json:"fcr_diff"`
|
||||||
AwgAct float64 `json:"awg_act"`
|
AwgAct float64 `json:"awg_act"`
|
||||||
AwgStd float64 `json:"awg_std"`
|
AwgStd float64 `json:"awg_std"`
|
||||||
FeedIntake float64 `json:"feed_intake"`
|
FeedIntake float64 `json:"feed_intake"`
|
||||||
FeedIntakeStd float64 `json:"feed_intake_std"`
|
FeedIntakeStd float64 `json:"feed_intake_std"`
|
||||||
HenDayAct *float64 `json:"hen_day_act,omitempty"`
|
HenDayAct float64 `json:"hen_day_act,omitempty"`
|
||||||
HendayStd float64 `json:"hen_day_std"`
|
HendayStd float64 `json:"hen_day_std"`
|
||||||
EggMass *float64 `json:"egg_mass,omitempty"`
|
EggMass float64 `json:"egg_mass,omitempty"`
|
||||||
EggMassStd float64 `json:"egg_mass_std"`
|
EggMassStd float64 `json:"egg_mass_std"`
|
||||||
EggWeight *float64 `json:"egg_weight,omitempty"`
|
EggWeight float64 `json:"egg_weight,omitempty"`
|
||||||
EggWeightStd float64 `json:"egg_weight_std"`
|
EggWeightStd float64 `json:"egg_weight_std"`
|
||||||
HenHouseAct *float64 `json:"hen_housed_act,omitempty"`
|
HenHouseAct float64 `json:"hen_housed_act,omitempty"`
|
||||||
HenHouseStd float64 `json:"hen_housed_std"`
|
HenHouseStd float64 `json:"hen_housed_std"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ClosingSalesGroupDTO struct {
|
type ClosingSalesGroupDTO struct {
|
||||||
|
|||||||
@@ -930,19 +930,19 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
|
|||||||
if !isGrowing {
|
if !isGrowing {
|
||||||
if targetAverages.HenDayCount > 0 {
|
if targetAverages.HenDayCount > 0 {
|
||||||
henDayAct := targetAverages.HenDayAvg
|
henDayAct := targetAverages.HenDayAvg
|
||||||
performance.HenDayAct = &henDayAct
|
performance.HenDayAct = henDayAct
|
||||||
}
|
}
|
||||||
if targetAverages.HenHouseCount > 0 {
|
if targetAverages.HenHouseCount > 0 {
|
||||||
henHouseAct := targetAverages.HenHouseAvg
|
henHouseAct := targetAverages.HenHouseAvg
|
||||||
performance.HenHouseAct = &henHouseAct
|
performance.HenHouseAct = henHouseAct
|
||||||
}
|
}
|
||||||
if targetAverages.EggWeightCount > 0 {
|
if targetAverages.EggWeightCount > 0 {
|
||||||
eggWeight := targetAverages.EggWeightAvg
|
eggWeight := targetAverages.EggWeightAvg
|
||||||
performance.EggWeight = &eggWeight
|
performance.EggWeight = eggWeight
|
||||||
}
|
}
|
||||||
if targetAverages.EggMassCount > 0 {
|
if targetAverages.EggMassCount > 0 {
|
||||||
eggMass := targetAverages.EggMassAvg
|
eggMass := targetAverages.EggMassAvg
|
||||||
performance.EggMass = &eggMass
|
performance.EggMass = eggMass
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
performance.DeffFcr = performance.FcrStd - performance.FcrAct
|
performance.DeffFcr = performance.FcrStd - performance.FcrAct
|
||||||
|
|||||||
Reference in New Issue
Block a user