From 41dc74023dcb4f1143095f326f8e142313f49500 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期日, 28 四月 2024 11:11:08 +0800
Subject: [PATCH] 修改
---
constvar/const.go | 2 ++
controllers/attendance_controller.go | 2 +-
controllers/work_type_manage_controller.go | 2 +-
models/work_type_manage.go | 4 ++++
models/worker.go | 3 +--
controllers/worker_controller.go | 2 +-
models/attendance_manage.go | 9 +++++++++
7 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index 4acbec9..018497d 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -69,6 +69,8 @@
OutsourcingSupplierCreditGrade //淇＄敤绛夌骇
OutsourcingSupplierRange //渚涜揣鑼冨洿
SalaryType //鍢夎仈钖祫绫诲瀷
+ WildSilk //閲庣氦
+ Absenteeism //缂哄嫟
)
// ShiftType 鐝绫诲瀷
diff --git a/controllers/attendance_controller.go b/controllers/attendance_controller.go
index f7c430f..7d0d3f1 100644
--- a/controllers/attendance_controller.go
+++ b/controllers/attendance_controller.go
@@ -202,7 +202,7 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- manages, total, err := models.NewAttendanceManageSearch().SetPage(params.Page, params.PageSize).Find()
+ manages, total, err := models.NewAttendanceManageSearch().SetPage(params.Page, params.PageSize).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err)
return
diff --git a/controllers/work_type_manage_controller.go b/controllers/work_type_manage_controller.go
index bceb209..336edc3 100644
--- a/controllers/work_type_manage_controller.go
+++ b/controllers/work_type_manage_controller.go
@@ -69,7 +69,7 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- find, total, err := models.NewWorkTypeManageSearch().SetPage(params.Page, params.PageSize).Find()
+ find, total, err := models.NewWorkTypeManageSearch().SetPreload(true).SetPage(params.Page, params.PageSize).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
diff --git a/controllers/worker_controller.go b/controllers/worker_controller.go
index 2fb8a09..d22304e 100644
--- a/controllers/worker_controller.go
+++ b/controllers/worker_controller.go
@@ -101,7 +101,7 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- workers, total, err := models.NewWorkerSearch().SetPage(params.Page, params.PageSize).SetOrder("updated_at desc").Find()
+ workers, total, err := models.NewWorkerSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetOrder("updated_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
return
diff --git a/models/attendance_manage.go b/models/attendance_manage.go
index 08db86f..26996cc 100644
--- a/models/attendance_manage.go
+++ b/models/attendance_manage.go
@@ -35,6 +35,7 @@
Ids []uint
Month string
Keyword string
+ Order string
Orm *gorm.DB
}
)
@@ -87,6 +88,11 @@
return slf
}
+func (slf *AttendanceManageSearch) SetOrder(order string) *AttendanceManageSearch {
+ slf.Order = order
+ return slf
+}
+
func (slf *AttendanceManageSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
@@ -113,6 +119,9 @@
if slf.Keyword != "" {
db = db.Where("worker_name like ? or worker_id like ?", "%"+slf.Keyword+"%", "%"+slf.Keyword+"%")
}
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
+ }
return db
}
diff --git a/models/work_type_manage.go b/models/work_type_manage.go
index eb11aca..e19ce79 100644
--- a/models/work_type_manage.go
+++ b/models/work_type_manage.go
@@ -61,6 +61,10 @@
db = db.Where("id = ?", slf.ID)
}
+ if slf.Preload {
+ db = db.Model(WorkTypeManage{}).Preload("SalaryPlans")
+ }
+
return db
}
diff --git a/models/worker.go b/models/worker.go
index 678a213..20d60f0 100644
--- a/models/worker.go
+++ b/models/worker.go
@@ -115,8 +115,7 @@
}
if slf.Keyword != "" {
- db.Joins("WorkerSkill")
- db = db.Where("worker.name LIKE ? or worker.phone_num LIKE ? or WorkerSkill.name like ?", "%"+slf.Keyword+"%", "%"+slf.Keyword+"%", "%"+slf.Keyword+"%")
+ db = db.Where("worker.name LIKE ? or worker.phone_num LIKE ? ", "%"+slf.Keyword+"%", "%"+slf.Keyword+"%")
}
if slf.Status > 0 {
--
Gitblit v1.8.0