mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
Merge branch 'fix/week-record' into 'development'
[FIX][BE]: adjust calculate for week at recording list See merge request mbugroup/lti-api!520
This commit is contained in:
@@ -314,9 +314,13 @@ func toRecordingProjectFlockDTO(e entity.Recording) RecordingProjectFlockDTO {
|
||||
result.Period = pfk.Period
|
||||
|
||||
if pfk.ProjectFlock.ProductionStandard.Id != 0 {
|
||||
week := recordingWeekValue(e)
|
||||
if e.StandardWeek != nil && *e.StandardWeek > 0 {
|
||||
week = *e.StandardWeek
|
||||
}
|
||||
result.ProductionStandart = &RecordingProductionStandardDTO{
|
||||
Id: pfk.ProjectFlock.ProductionStandard.Id,
|
||||
Week: recordingWeekValue(e),
|
||||
Week: week,
|
||||
Name: pfk.ProjectFlock.ProductionStandard.Name,
|
||||
HenDayStd: floatValue(e.StandardHenDay),
|
||||
HenHouseStd: floatValue(e.StandardHenHouse),
|
||||
|
||||
Reference in New Issue
Block a user