|
|
@@ -280,7 +280,7 @@ func (s Service) AppointTimeInfo(req *equipment2.AppointTimeInfoReq, userinfo re
|
|
|
var instr AppointTimeInfoInstrument
|
|
|
err := s.Dao.DB.Table("instrument").
|
|
|
Where("Id", req.InstrumentId).
|
|
|
- Fields("Id, BeginAt, EndAt, Weekday, IsAppointAvailable, InAdvance, FurtherRange").
|
|
|
+ Fields("Id, BeginAt, EndAt, Weekday, IsAppointAvailable, InAdvance, FurtherRange, FurtherLimit").
|
|
|
Struct(&instr)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
@@ -363,6 +363,9 @@ func (s Service) AppointTimeInfo(req *equipment2.AppointTimeInfoReq, userinfo re
|
|
|
furtherLimit = gtime.Now().Add(time.Hour * time.Duration(instr.FurtherLimit))
|
|
|
}
|
|
|
}
|
|
|
+ // fmt.Println("============")
|
|
|
+ // fmt.Println(qualificationCount, instr.FurtherLimit, furtherLimit)
|
|
|
+ // fmt.Println("============")
|
|
|
|
|
|
unavailable := []TimeSpan{}
|
|
|
// 仪器设置的可预约范围外
|