作者 yangfu

fix:默认车间ID

@@ -225,12 +225,12 @@ func (ptr *PGCommonStatisticsService) ProportionOfSecondLevelStatistics(queryOpt @@ -225,12 +225,12 @@ func (ptr *PGCommonStatisticsService) ProportionOfSecondLevelStatistics(queryOpt
225 // 车间生产效率统计 225 // 车间生产效率统计
226 func (ptr *PGCommonStatisticsService) WorkshopProductionEfficiencyStatistics(queryOptions map[string]interface{}) (interface{}, error) { 226 func (ptr *PGCommonStatisticsService) WorkshopProductionEfficiencyStatistics(queryOptions map[string]interface{}) (interface{}, error) {
227 var request = &HourProductiveStatisticsRequest{} 227 var request = &HourProductiveStatisticsRequest{}
228 - if err := utils.LoadQueryObject(queryOptions, request); err != nil {  
229 - return nil, err  
230 - }  
231 if request.WorkshopId == 0 { 228 if request.WorkshopId == 0 {
232 request.WorkshopId = constant.MANUFACTURE_DEFAULT_WORKSHOPID 229 request.WorkshopId = constant.MANUFACTURE_DEFAULT_WORKSHOPID
233 } 230 }
  231 + if err := utils.LoadQueryObject(queryOptions, request); err != nil {
  232 + return nil, err
  233 + }
234 workshopRepository, _ := repository.NewWorkshopRepository(ptr.transactionContext) 234 workshopRepository, _ := repository.NewWorkshopRepository(ptr.transactionContext)
235 type record struct { 235 type record struct {
236 Oee float64 `json:"oee"` 236 Oee float64 `json:"oee"`
@@ -423,12 +423,12 @@ type DeviceInfo struct { @@ -423,12 +423,12 @@ type DeviceInfo struct {
423 // 设备生产效率统计 423 // 设备生产效率统计
424 func (ptr *PGCommonStatisticsService) DeviceProductionEfficiencyStatistics(queryOptions map[string]interface{}) (interface{}, error) { 424 func (ptr *PGCommonStatisticsService) DeviceProductionEfficiencyStatistics(queryOptions map[string]interface{}) (interface{}, error) {
425 var request = &HourProductiveStatisticsRequest{} 425 var request = &HourProductiveStatisticsRequest{}
426 - if err := utils.LoadQueryObject(queryOptions, request); err != nil {  
427 - return nil, err  
428 - }  
429 if request.WorkshopId == 0 { 426 if request.WorkshopId == 0 {
430 request.WorkshopId = constant.MANUFACTURE_DEFAULT_WORKSHOPID 427 request.WorkshopId = constant.MANUFACTURE_DEFAULT_WORKSHOPID
431 } 428 }
  429 + if err := utils.LoadQueryObject(queryOptions, request); err != nil {
  430 + return nil, err
  431 + }
432 432
433 deviceRepository, _ := repository.NewDeviceRepository(ptr.transactionContext) 433 deviceRepository, _ := repository.NewDeviceRepository(ptr.transactionContext)
434 deviceDailyRunningRecordDao, _ := dao.NewDeviceDailyRunningRecordDao(ptr.transactionContext) 434 deviceDailyRunningRecordDao, _ := dao.NewDeviceDailyRunningRecordDao(ptr.transactionContext)