From 601626882fce92c4d23b232be1f7f37f6c8a4dcf Mon Sep 17 00:00:00 2001 From: jiangyong27 Date: Sat, 7 Oct 2023 15:03:47 +0800 Subject: [PATCH] award2 --- server/service/staff_salary.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/service/staff_salary.go b/server/service/staff_salary.go index 28d22b1..e878858 100644 --- a/server/service/staff_salary.go +++ b/server/service/staff_salary.go @@ -176,7 +176,7 @@ func (s *StaffSalary) Summary(month string, ctx *gin.Context) { item = append(item, cast.ToString(staff.SocialInsurence)) item = append(item, cast.ToString(staff.PersonalTax)) item = append(item, cast.ToString(staff.Holiday)) - item = append(item, cast.ToString(butil.FloatCut(staff.RealSalary-staff.SocialInsurence-staff.PersonalTax))) + item = append(item, cast.ToString(butil.FloatCut(staff.RealSalary+staff.AwardSalary-staff.SocialInsurence-staff.PersonalTax))) datas = append(datas, item) summary.BaseSalary += staff.BaseSalary @@ -195,7 +195,7 @@ func (s *StaffSalary) Summary(month string, ctx *gin.Context) { datas = append(datas, []string{"合计", "-", "-", "-", cast.ToString(summary.BaseSalary), cast.ToString(summary.RealSalary), cast.ToString(summary.AwardSalary), cast.ToString(summary.SocialInsurence), cast.ToString(summary.PersonalTax), cast.ToString(summary.Holiday), - cast.ToString(butil.FloatCut(summary.RealSalary - summary.SocialInsurence - summary.PersonalTax))}) + cast.ToString(butil.FloatCut(summary.RealSalary + summary.AwardSalary - summary.SocialInsurence - summary.PersonalTax))}) if xls != "" { filename := fmt.Sprintf("summary_%s.xlsx", time.Now().Format("20060102_150405"))