fix

zhangqian

2023-10-30 10c65da3d2af7056f48d9301e83f53f102f76e18

 service/task.go

@@ -5,6 +5,7 @@
   "apsClient/constvar"
   "apsClient/model"
   "apsClient/model/common"
   "apsClient/model/request"
   "apsClient/model/response"
   "apsClient/pkg/ecode"
   "apsClient/pkg/logx"
@@ -29,7 +30,7 @@
   taskResp = &response.TaskResponse{
      Tasks:     taskList,
      TaskCount: count,
      Workers:   slf.WorkerDistinct(workers),
      Workers:   workers,
   }

   var (
@@ -99,8 +100,9 @@
      workers = append(workers, procedure.ProceduresInfo.Workers...)
   }
   taskResp = &response.TaskResponse{
      Tasks:   taskList,
      Workers: slf.WorkerDistinct(workers),
      Tasks:     taskList,
      TaskCount: count,
      Workers:   slf.WorkerDistinct(workers),
   }
   return taskResp, ecode.OK
}
@@ -200,3 +202,84 @@
func (slf TaskService) RemoveTaskStatusSync(ids []uint) (err error) {
   return model.NewTaskStatusSyncSearch(nil).SetIDs(ids).Delete()
}

// GetTask2 获取任务列表2
func (slf TaskService) GetTask2(offset, limit int, channels []int32, queryType request.QueryType) (taskResp *response.TaskResponse, err error) {
   var taskList []*response.TaskData
   var count int64
   var workers []*common.ProcedureWorker

   taskResp = &response.TaskResponse{
      Tasks:     taskList,
      TaskCount: count,
      Workers:   workers,
   }

   var (
      orders       []*model.Order
      procedures   []*model.Procedures
      workOrderIds []string
   )
   search := model.NewProceduresSearch(nil).
      SetDeviceId(conf.Conf.System.DeviceId).
      SetOffset(offset, limit).SetChannels(channels)
   nowTs := time.Now().Unix()
   switch queryType {
   case request.QueryTypeUnFinish:
      search.SetStatusNot(model.ProcedureStatusFinished).SetOrder("status desc, start_time asc")
   case request.QueryTypeToday:
      search.SetStatusNot(model.ProcedureStatusFinished).SetStartTimeMin(nowTs).SetEndTimeMax(nowTs + 86400).SetOrder("status desc, start_time asc")
   case request.QueryTypeFinished:
      search.SetStatus(model.ProcedureStatusFinished).SetOrder("start_time desc")
   }

   procedures, total, err := search.Find()
   if err != nil {
      return taskResp, err
   }

   if err != nil {
      return taskResp, err
   }
   if len(procedures) == 0 {
      return taskResp, nil
   }

   for _, procedure := range procedures {
      workOrderIds = append(workOrderIds, procedure.WorkOrderID)
   }
   orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //由工序反推工单
   if err != nil {
      return taskResp, err
   }

   orderMap := make(map[string]*model.Order, len(workOrderIds))
   for _, order := range orders {
      orderMap[order.WorkOrderID] = order
   }
   for _, procedure := range procedures {
      taskData := response.TaskData{
         Order:                 orderMap[procedure.WorkOrderID],
         Procedure:             procedure,
         AllProcedures:         procedure.ProceduresInfo.AllProcedureNames,
         CurrentProcedureIndex: 0,
         Channel:               procedure.Channel,
      }
      index := 0
      for _, name := range procedure.ProceduresInfo.AllProcedureNames {
         if name == procedure.ProceduresInfo.ProcedureName {
            break
         }
         index++
      }
      taskData.CurrentProcedureIndex = index
      taskList = append(taskList, &taskData)
      workers = append(workers, procedure.ProceduresInfo.Workers...)
   }
   taskResp = &response.TaskResponse{
      Tasks:     taskList,
      TaskCount: total,
      Workers:   slf.WorkerDistinct(workers),
   }
   return taskResp, err
}