Merge branch 'master' into feat-serf

zhangqian

2023-10-10 94139ee1a04839135eb760b431f1212703d6cd86

 service/process_model.go

@@ -5,14 +5,14 @@
   "apsClient/model"
)

func GetProcessModelList(page, pageSize int) (list []*model.ProcessModel, total int64, err error) {
func GetProcessModelList(offset, limit int, currentNumber string) (list []*model.ProcessModel, total int64, err error) {
   device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
   if err != nil {
      return
   }
   list, total, err = model.NewProcessModelSearch().
      SetIsNew(true).SetOrder("id desc").
      SetPage(page, pageSize).SetProcedures(device.ProceduresArr).Find()
      SetIsNew(true).SetOrder("id desc").SetCurrentNumber(currentNumber).
      SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
   return
}