From 76a84d89d63041232c646ca28c59239dd00f7fc5 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 30 四月 2024 09:58:46 +0800
Subject: [PATCH] 薪资计算
---
models/salary_plan.go | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/models/salary_plan.go b/models/salary_plan.go
index 1c326ec..55e84d6 100644
--- a/models/salary_plan.go
+++ b/models/salary_plan.go
@@ -10,8 +10,10 @@
//SalaryPlan 钖祫鏂规
SalaryPlan struct {
gorm.Model
- Name string `json:"name" gorm:"type:varchar(255);comment:钖祫鏂规鍚嶇О"`
- SalaryType string `json:"salaryType" gorm:"type:varchar(255);comment:钖祫绫诲瀷"`
+ Name string `json:"name" gorm:"type:varchar(255);comment:钖祫鏂规鍚嶇О"`
+ SalaryTypeId uint `json:"salaryTypeId" gorm:"type:int(11);comment:钖祫绫诲瀷id"`
+ SalaryType MiniDict `json:"salaryType" gorm:"foreignKey:SalaryTypeId;references:ID"`
+ //SalaryType string `json:"salaryType" gorm:"type:varchar(255);comment:钖祫绫诲瀷"`
SalaryFormula string `json:"salaryFormula" gorm:"type:varchar(255);comment:钖祫鍏紡"`
Cycle string `json:"cycle" gorm:"type:varchar(255);comment:鍛ㄦ湡"`
CreateTime string `json:"createTime" gorm:"type:varchar(255);comment:娣诲姞鏃堕棿"`
@@ -63,7 +65,7 @@
}
if slf.Preload {
- db = db.Model(&SalaryPlan{}).Preload("WorkTypes")
+ db = db.Model(&SalaryPlan{}).Preload("WorkTypes").Preload("SalaryType")
}
return db
--
Gitblit v1.8.0