|
@ -36,6 +36,11 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s |
|
|
engine := db.Eloquent.Master() |
|
|
engine := db.Eloquent.Master() |
|
|
session := engine.NewSession() |
|
|
session := engine.NewSession() |
|
|
defer session.Close() |
|
|
defer session.Close() |
|
|
|
|
|
|
|
|
|
|
|
engineSlaves := db.Eloquent.Slaves() |
|
|
|
|
|
sessionSlave := engineSlaves[1].NewSession() |
|
|
|
|
|
defer sessionSlave.Close() |
|
|
|
|
|
|
|
|
daoWorkLine := baseDal.NewWorkLineDAO(session, user.PlantNr, user.UserId) |
|
|
daoWorkLine := baseDal.NewWorkLineDAO(session, user.PlantNr, user.UserId) |
|
|
daoDayModel := baseDal.NewDayModelDAO(session, user.PlantNr, user.UserId) |
|
|
daoDayModel := baseDal.NewDayModelDAO(session, user.PlantNr, user.UserId) |
|
|
//daoWeekModel := baseDal.NewWeekModelLstDAO(session, user.PlantNr, user.UserId)
|
|
|
//daoWeekModel := baseDal.NewWeekModelLstDAO(session, user.PlantNr, user.UserId)
|
|
@ -43,7 +48,7 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s |
|
|
//daoWorkCalendar := baseDal.NewWorkCalendarDAO(session, user.PlantNr, user.UserId)
|
|
|
//daoWorkCalendar := baseDal.NewWorkCalendarDAO(session, user.PlantNr, user.UserId)
|
|
|
daoWorkCalendarLst := baseDal.NewWorkCalendarLstDAO(session, user.PlantNr, user.UserId) |
|
|
daoWorkCalendarLst := baseDal.NewWorkCalendarLstDAO(session, user.PlantNr, user.UserId) |
|
|
daoWorkShift := baseDal.NewWorkShiftDAO(session, user.PlantNr, user.UserId) |
|
|
daoWorkShift := baseDal.NewWorkShiftDAO(session, user.PlantNr, user.UserId) |
|
|
dashlisDao := baseDal.NewRPDashBoardLstDAO(session, user.PlantNr, user.UserId) |
|
|
|
|
|
|
|
|
dashlisDao := baseDal.NewRPDashBoardLstDAO(sessionSlave, user.PlantNr, user.UserId) |
|
|
dashlist, err := dashlisDao.Select([]grmi.Predicate{baseMeta.RPDashBoardLst_DashboardId.NewPredicate(grmi.Equal, 1)}, nil) |
|
|
dashlist, err := dashlisDao.Select([]grmi.Predicate{baseMeta.RPDashBoardLst_DashboardId.NewPredicate(grmi.Equal, 1)}, nil) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return nil, err |
|
|
return nil, err |
|
@ -1394,7 +1399,7 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou |
|
|
one := model.DashboardData{} |
|
|
one := model.DashboardData{} |
|
|
one.Date = DayModelHours[i] |
|
|
one.Date = DayModelHours[i] |
|
|
if ok { |
|
|
if ok { |
|
|
one.Val = utils.Decimal((float64(val)/float64(personNum)), 2) |
|
|
|
|
|
|
|
|
one.Val = utils.Decimal((float64(val) / float64(personNum)), 2) |
|
|
} else { |
|
|
} else { |
|
|
one.Val = 0 |
|
|
one.Val = 0 |
|
|
} |
|
|
} |
|
@ -1432,4 +1437,4 @@ func (impl *CustOrderServiceImplement) SelectAndonInfo(user *global.User) (int, |
|
|
return 1, nil |
|
|
return 1, nil |
|
|
} |
|
|
} |
|
|
return 0, nil |
|
|
return 0, nil |
|
|
} |
|
|
|
|
|
|
|
|
} |