|
@ -366,12 +366,10 @@ func (impl *WorkCalendarLstDAOImplement) SelectJoinDayModel(workCalendarNr int) |
|
|
// session = session.Where(where, parameters...)
|
|
|
// session = session.Where(where, parameters...)
|
|
|
//}
|
|
|
//}
|
|
|
session.Where("WorkCalendarLst.PlantNr = ? and WorkCalendarLst.WorkCalendarNr = ?", impl.plantNr, workCalendarNr) |
|
|
session.Where("WorkCalendarLst.PlantNr = ? and WorkCalendarLst.WorkCalendarNr = ?", impl.plantNr, workCalendarNr) |
|
|
condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s.%s = %s.%s", |
|
|
|
|
|
|
|
|
condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s = %s", |
|
|
meta.WorkCalendarLst.TableName, |
|
|
meta.WorkCalendarLst.TableName, |
|
|
meta.DayModel.TableName, |
|
|
meta.DayModel.TableName, |
|
|
meta.WorkCalendarLst.TableName, |
|
|
|
|
|
meta.WorkCalendarLst_DayModelNr.ColumnName, |
|
|
meta.WorkCalendarLst_DayModelNr.ColumnName, |
|
|
meta.DayModel.TableName, |
|
|
|
|
|
meta.DayModel_DayModelNr.ColumnName) |
|
|
meta.DayModel_DayModelNr.ColumnName) |
|
|
session.Join("LEFT", meta.DayModel.TableName, condition) |
|
|
session.Join("LEFT", meta.DayModel.TableName, condition) |
|
|
session = session.OrderBy("WorkCalendarLst.PlantNr") |
|
|
session = session.OrderBy("WorkCalendarLst.PlantNr") |
|
|