|
|
@ -217,8 +217,8 @@ func (t *PmWo) GetPage(pageSize int, pageIndex int, searchtime string, duehourin |
|
|
|
e := db.Eloquent.Master() |
|
|
|
table := e.Table(t.TableName()).Where("pm_wo.finr = ? ", t.Finr) |
|
|
|
query := e.Table(t.TableName()).Where("pm_wo.finr = ? ", t.Finr) |
|
|
|
query = query.Join("LEFT", "pm_service", "pm_wo.finr = pm_service.finr and pm_wo.mainservicenr = pm_service.mainserviceid") |
|
|
|
table = table.Join("LEFT", "pm_service", "pm_wo.finr = pm_service.finr and pm_wo.mainservicenr = pm_service.mainserviceid") |
|
|
|
query = query.Join("LEFT", "pm_service", "pm_wo.finr = pm_service.finr and pm_wo.mainservicenr = pm_service.mainserviceid").Join("LEFT", "pm_asset", "pm_wo.finr = pm_asset.finr and pm_wo.assetid = pm_asset.assetid") |
|
|
|
table = table.Join("LEFT", "pm_service", "pm_wo.finr = pm_service.finr and pm_wo.mainservicenr = pm_service.mainserviceid").Join("LEFT", "pm_asset", "pm_wo.finr = pm_asset.finr and pm_wo.assetid = pm_asset.assetid") |
|
|
|
|
|
|
|
if !utils.ValueIsEmpty(searchtime) { |
|
|
|
searchtimes := strings.Split(searchtime, "-") |
|
|
@ -247,8 +247,8 @@ func (t *PmWo) GetPage(pageSize int, pageIndex int, searchtime string, duehourin |
|
|
|
} |
|
|
|
if !utils.ValueIsEmpty(t.Descr) { |
|
|
|
descr := "%" + t.Descr + "%" |
|
|
|
table = table.And("pm_wo.descr like ?", descr) |
|
|
|
query = query.And("pm_wo.descr like ?", descr) |
|
|
|
table = table.And("pm_asset.descr like ?", descr) |
|
|
|
query = query.And("pm_asset.descr like ?", descr) |
|
|
|
} |
|
|
|
offset := (pageIndex - 1) * pageSize |
|
|
|
|
|
|
|