From cc7c2094568ea8f9d1697da5ed0a2c759ca81abd Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期五, 30 八月 2024 17:18:30 +0800
Subject: [PATCH] 方法修改，修改薪资列表，添加分页查询
---
controllers/workshop_manage_controller.go | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/controllers/workshop_manage_controller.go b/controllers/workshop_manage_controller.go
index 50109a7..c68422b 100644
--- a/controllers/workshop_manage_controller.go
+++ b/controllers/workshop_manage_controller.go
@@ -245,20 +245,42 @@
return
}
all, err := models.NewWorkshopManageSearch().
- SetType(constvar.Group).SetWorkshopName(params.WorkshopName).SetGroupNumber(params.GroupNumber).
+ SetType(constvar.Group).SetWorkshopNumber(params.WorkshopNumber).SetWorkshopName(params.WorkshopName).SetGroupNumber(params.GroupNumber).
SetOrder("workshop_number,group_number,start_car_number").FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
}
- carNumbers := make([]int, 0)
+ //carNumbers := make([]int, 0)
+ var (
+ startCarNumber = 0
+ endCarNumber = 0
+ startCarHalf = constvar.LeftHalfCar
+ endCarHalf = constvar.RightHalfCar
+ )
for _, manage := range all {
- i := manage.StartCarNumber
- for ; i <= manage.EndCarNumber; i++ {
- carNumbers = append(carNumbers, i)
+ if startCarNumber == 0 {
+ startCarNumber = manage.StartCarNumber
+ startCarHalf = manage.StartCarHalf
+ endCarNumber = manage.EndCarNumber
+ endCarHalf = manage.EndCarHalf
+ continue
+ }
+ if manage.StartCarNumber < startCarNumber {
+ startCarNumber = manage.StartCarNumber
+ startCarHalf = manage.StartCarHalf
+ }
+ if manage.EndCarNumber > endCarNumber {
+ endCarNumber = manage.EndCarNumber
+ endCarHalf = manage.EndCarHalf
}
}
- util.ResponseFormat(c, code.Success, carNumbers)
+ m := make(map[string]interface{})
+ m["startCarNumber"] = startCarNumber
+ m["startCarHalf"] = startCarHalf
+ m["endCarNumber"] = endCarNumber
+ m["endCarHalf"] = endCarHalf
+ util.ResponseFormat(c, code.Success, m)
}
// GetWorkshopManageGroup
--
Gitblit v1.8.0