From 1bd58eb901da8ca32d15c121effa7e22cc89e1bd Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期四, 25 七月 2024 11:47:12 +0800
Subject: [PATCH] 添加功能，工资计算（根据历史工资excel给定的规则进行编写）
---
models/worker_position.go | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/models/worker_position.go b/models/worker_position.go
index 07a9861..7907e4e 100644
--- a/models/worker_position.go
+++ b/models/worker_position.go
@@ -31,6 +31,7 @@
Keyword string
OverlappingDateStart string
OverlappingDateEnd string
+ WorkerDate string
}
)
@@ -106,7 +107,7 @@
if slf.Keyword != "" {
kw := "%" + slf.Keyword + "%"
- db = db.Joins("Worker").Where("silk_mentor.worker_id LIKE ? or Worker.name LIKE ?", kw, kw)
+ db = db.Joins("Worker").Where("silk_worker_position.worker_id LIKE ? or Worker.name LIKE ? or silk_worker_position.workshop like ? or silk_worker_position.workshop_name like ?", kw, kw, kw, kw)
}
if slf.Workshop != "" {
--
Gitblit v1.8.0