From a904aa32e66688ba76c9e4b71b6738b0ba5f5d4f Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期四, 25 七月 2024 11:44:09 +0800
Subject: [PATCH] 添加字段，工种添加工种编码，用于计算工资（id无法固定工种信息）
---
models/worker.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/models/worker.go b/models/worker.go
index 678a213..ba2cc2a 100644
--- a/models/worker.go
+++ b/models/worker.go
@@ -11,13 +11,15 @@
// Worker 浜哄姏璧勬簮
Worker struct {
BaseModelString
+ DeletedAt gorm.DeletedAt `gorm:"index"`
Name string `gorm:"index;type:varchar(191);not null;comment:浜哄憳濮撳悕" json:"name"`
PhoneNum string `gorm:"type:varchar(191);comment:鎵嬫満鍙�" json:"phoneNum"`
ShopID string `gorm:"type:varchar(191);comment:鎵�灞炶溅闂碔D" json:"shopId"`
ShopName string `gorm:"type:varchar(191);comment:杞﹂棿鍚嶇О锛屼粎鏌ヨ鐢�" json:"shopName"`
Status constvar.WorkerStatus `gorm:"index;type:int(11);comment:浜哄憳鐘舵��" json:"status"`
WorkTypeId uint `gorm:"type:int(11);comment:宸ョid" json:"workTypeId"`
- WorkType string `gorm:"type:varchar(255);comment:宸ョ" json:"workType"`
+ WorkTypeCode constvar.JobType `gorm:"type:varchar(255);comment:宸ョ浠ｇ爜" json:"workTypeCode"`
+ WorkType string `gorm:"type:varchar(255);comment:宸ョ鍚嶇О" json:"workType"`
GroupNumber int `gorm:"type:int(11);comment:缁勫埆" json:"groupNumber"`
EmploymentTime string `gorm:"type:varchar(255);comment:鍏ヨ亴鏃堕棿" json:"employmentTime"`
AddPeople string `gorm:"type:varchar(255);comment:娣诲姞浜�" json:"addPeople"`
@@ -115,8 +117,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 {
@@ -201,7 +202,7 @@
func (slf *WorkerSearch) Delete() error {
var db = slf.build()
- if err := db.Unscoped().Delete(&Worker{}).Error; err != nil {
+ if err := db.Delete(&Worker{}).Error; err != nil {
return err
}
--
Gitblit v1.8.0