From 8184ba2f16c7947184f744fc7c1bffacfc47c560 Mon Sep 17 00:00:00 2001
From: jiangyong27 <yong27@163.com>
Date: Thu, 13 Mar 2025 11:18:47 +0800
Subject: [PATCH] salary

---
 server/api/salary.go           | 31 +++++++++++++++++--------------
 server/service/staff_salary.go |  4 ++--
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/server/api/salary.go b/server/api/salary.go
index 83fc41a..4624cde 100644
--- a/server/api/salary.go
+++ b/server/api/salary.go
@@ -11,12 +11,13 @@ type Salary struct {
 	Month          string `json:"month,omitempty"`
 	Username       string `json:"username,omitempty"`
 	Realname       string `json:"realname,omitempty"`
-	SalaryBase     string `json:"salary_base,omitempty"`
-	SalaryTarget   string `json:"salary_target,omitempty"`
-	AttendSalary   string `json:"attend_salary,omitempty"`
+	BaseSalary     string `json:"base_salary,omitempty"`
 	TargetSalary   string `json:"target_salary,omitempty"`
-	AwardSalary    string `json:"award_salary,omitempty"`
-	OtherSalary    string `json:"other_salary,omitempty"`
+	RealSalary     string `json:"real_salary,omitempty"`
+	AttendIncome   string `json:"attend_income,omitempty"`
+	TargetIncome   string `json:"target_income,omitempty"`
+	AwardIncome    string `json:"award_income,omitempty"`
+	OtherIncome    string `json:"other_income,omitempty"`
 	ShouldDay      string `json:"should_day,omitempty"`
 	AttendDay      string `json:"attend_day,omitempty"`
 	HolidayDay     string `json:"holiday_day,omitempty"`
@@ -50,10 +51,11 @@ func (s *Salary) From(m *model.StaffSalary) {
 	s.Id = cast.ToString(m.Id)
 	s.Username = m.Username
 	s.Month = m.Month
-	s.AttendSalary = goutil.FormatFloat(m.AttendSalary)
-	s.TargetSalary = goutil.FormatFloat(m.TargetSalary)
-	s.AwardSalary = goutil.FormatFloat(m.AwardSalary)
-	s.OtherSalary = goutil.FormatFloat(m.OtherSalary)
+	s.RealSalary = goutil.FormatFloat(m.GetRealSalary())
+	s.AttendIncome = goutil.FormatFloat(m.AttendSalary)
+	s.TargetIncome = goutil.FormatFloat(m.TargetSalary)
+	s.AwardIncome = goutil.FormatFloat(m.AwardSalary)
+	s.OtherIncome = goutil.FormatFloat(m.OtherSalary)
 	s.ShouldDay = cast.ToString(m.ShouldDay)
 	s.AttendDay = goutil.FormatFloat(m.AttendDay)
 	s.HolidayDay = goutil.FormatFloat(m.HolidayDay)
@@ -66,12 +68,13 @@ func (s *Salary) From(m *model.StaffSalary) {
 }
 
 func (s *Salary) Add(o *Salary) {
-	s.SalaryTarget = goutil.FormatFloat(cast.ToFloat64(s.SalaryTarget) + cast.ToFloat64(o.SalaryTarget))
-	s.SalaryBase = goutil.FormatFloat(cast.ToFloat64(s.SalaryBase) + cast.ToFloat64(o.SalaryBase))
-	s.AttendSalary = goutil.FormatFloat(cast.ToFloat64(s.AttendSalary) + cast.ToFloat64(o.AttendSalary))
 	s.TargetSalary = goutil.FormatFloat(cast.ToFloat64(s.TargetSalary) + cast.ToFloat64(o.TargetSalary))
-	s.AwardSalary = goutil.FormatFloat(cast.ToFloat64(s.AwardSalary) + cast.ToFloat64(o.AwardSalary))
-	s.OtherSalary = goutil.FormatFloat(cast.ToFloat64(s.OtherSalary) + cast.ToFloat64(o.OtherSalary))
+	s.BaseSalary = goutil.FormatFloat(cast.ToFloat64(s.BaseSalary) + cast.ToFloat64(o.BaseSalary))
+	s.RealSalary = goutil.FormatFloat(cast.ToFloat64(s.RealSalary) + cast.ToFloat64(o.RealSalary))
+	s.AttendIncome = goutil.FormatFloat(cast.ToFloat64(s.AttendIncome) + cast.ToFloat64(o.AttendIncome))
+	s.TargetIncome = goutil.FormatFloat(cast.ToFloat64(s.TargetIncome) + cast.ToFloat64(o.TargetIncome))
+	s.AwardIncome = goutil.FormatFloat(cast.ToFloat64(s.AwardIncome) + cast.ToFloat64(o.AwardIncome))
+	s.OtherIncome = goutil.FormatFloat(cast.ToFloat64(s.OtherIncome) + cast.ToFloat64(o.OtherIncome))
 	s.ShouldDay = cast.ToString(cast.ToInt(s.ShouldDay) + cast.ToInt(o.ShouldDay))
 	s.AttendDay = goutil.FormatFloat(cast.ToFloat64(s.AttendDay) + cast.ToFloat64(o.AttendDay))
 	s.HolidayDay = goutil.FormatFloat(cast.ToFloat64(s.HolidayDay) + cast.ToFloat64(o.HolidayDay))
diff --git a/server/service/staff_salary.go b/server/service/staff_salary.go
index cd7f4f1..304524b 100644
--- a/server/service/staff_salary.go
+++ b/server/service/staff_salary.go
@@ -52,8 +52,8 @@ func (s *StaffSalary) List(sess *session.AdminSession, req *api.ListSalaryReq) (
 		if staffUser != nil {
 			userSalary := staffUser.GetSalary()
 			staffSalary.Realname = staffUser.Realname
-			staffSalary.SalaryTarget = userSalary.Target
-			staffSalary.SalaryBase = userSalary.Base
+			staffSalary.TargetSalary = userSalary.Target
+			staffSalary.BaseSalary = userSalary.Base
 		}
 		items = append(items, staffSalary)
 	}