jiangyong
/
enterprise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

salary

This commit is contained in:
jiangyong27 2025-03-13 11:18:47 +08:00
parent 0a8e2822e8
commit 8184ba2f16
2 changed files with 19 additions and 16 deletions
server
api
salary.go
service
staff_salary.go

31
server/api/salary.go
View File

@ -11,12 +11,13 @@ type Salary struct {
Month string `json:"month,omitempty"` Month string `json:"month,omitempty"`
Username string `json:"username,omitempty"` Username string `json:"username,omitempty"`
Realname string `json:"realname,omitempty"` Realname string `json:"realname,omitempty"`
SalaryBase string `json:"salary_base,omitempty"` BaseSalary string `json:"base_salary,omitempty"`
SalaryTarget string `json:"salary_target,omitempty"`
AttendSalary string `json:"attend_salary,omitempty"`
TargetSalary string `json:"target_salary,omitempty"` TargetSalary string `json:"target_salary,omitempty"`
AwardSalary string `json:"award_salary,omitempty"` RealSalary string `json:"real_salary,omitempty"`
OtherSalary string `json:"other_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"` ShouldDay string `json:"should_day,omitempty"`
AttendDay string `json:"attend_day,omitempty"` AttendDay string `json:"attend_day,omitempty"`
HolidayDay string `json:"holiday_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.Id = cast.ToString(m.Id)
s.Username = m.Username s.Username = m.Username
s.Month = m.Month s.Month = m.Month
s.AttendSalary = goutil.FormatFloat(m.AttendSalary) s.RealSalary = goutil.FormatFloat(m.GetRealSalary())
s.TargetSalary = goutil.FormatFloat(m.TargetSalary) s.AttendIncome = goutil.FormatFloat(m.AttendSalary)
s.AwardSalary = goutil.FormatFloat(m.AwardSalary) s.TargetIncome = goutil.FormatFloat(m.TargetSalary)
s.OtherSalary = goutil.FormatFloat(m.OtherSalary) s.AwardIncome = goutil.FormatFloat(m.AwardSalary)
s.OtherIncome = goutil.FormatFloat(m.OtherSalary)
s.ShouldDay = cast.ToString(m.ShouldDay) s.ShouldDay = cast.ToString(m.ShouldDay)
s.AttendDay = goutil.FormatFloat(m.AttendDay) s.AttendDay = goutil.FormatFloat(m.AttendDay)
s.HolidayDay = goutil.FormatFloat(m.HolidayDay) s.HolidayDay = goutil.FormatFloat(m.HolidayDay)
@ -66,12 +68,13 @@ func (s *Salary) From(m *model.StaffSalary) {
} }
func (s *Salary) Add(o *Salary) { 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.TargetSalary = goutil.FormatFloat(cast.ToFloat64(s.TargetSalary) + cast.ToFloat64(o.TargetSalary))
s.AwardSalary = goutil.FormatFloat(cast.ToFloat64(s.AwardSalary) + cast.ToFloat64(o.AwardSalary)) s.BaseSalary = goutil.FormatFloat(cast.ToFloat64(s.BaseSalary) + cast.ToFloat64(o.BaseSalary))
s.OtherSalary = goutil.FormatFloat(cast.ToFloat64(s.OtherSalary) + cast.ToFloat64(o.OtherSalary)) 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.ShouldDay = cast.ToString(cast.ToInt(s.ShouldDay) + cast.ToInt(o.ShouldDay))
s.AttendDay = goutil.FormatFloat(cast.ToFloat64(s.AttendDay) + cast.ToFloat64(o.AttendDay)) s.AttendDay = goutil.FormatFloat(cast.ToFloat64(s.AttendDay) + cast.ToFloat64(o.AttendDay))
s.HolidayDay = goutil.FormatFloat(cast.ToFloat64(s.HolidayDay) + cast.ToFloat64(o.HolidayDay)) s.HolidayDay = goutil.FormatFloat(cast.ToFloat64(s.HolidayDay) + cast.ToFloat64(o.HolidayDay))

4
server/service/staff_salary.go
View File

@ -52,8 +52,8 @@ func (s *StaffSalary) List(sess *session.AdminSession, req *api.ListSalaryReq) (
if staffUser != nil { if staffUser != nil {
userSalary := staffUser.GetSalary() userSalary := staffUser.GetSalary()
staffSalary.Realname = staffUser.Realname staffSalary.Realname = staffUser.Realname
staffSalary.SalaryTarget = userSalary.Target staffSalary.TargetSalary = userSalary.Target
staffSalary.SalaryBase = userSalary.Base staffSalary.BaseSalary = userSalary.Base
} }
items = append(items, staffSalary) items = append(items, staffSalary)
} }