diff --git a/service/salary_calculator/salary_calculator_1002.go b/service/salary_calculator/salary_calculator_1002.go index ca300d1..e55d97b 100644 --- a/service/salary_calculator/salary_calculator_1002.go +++ b/service/salary_calculator/salary_calculator_1002.go @@ -33,14 +33,14 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) map[string]i log.Errorf("db error:%s", err.Error()) } - data["order_num"] = len(orders) + data["orderNum"] = len(orders) //2.处理的订单 processOrders, err := dao.NewExternalCorpOrder().QueryProcessOrder(s.user.Username, startTime, endTime) if err != nil { log.Errorf("db error:%s", err.Error()) } - data["process_num"] = len(processOrders) + data["processNum"] = len(processOrders) //3.下属订单 corpUser, err := dao.NewExternalCorpUser().Get(s.user.Username) @@ -53,7 +53,7 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) map[string]i if err != nil { log.Errorf("db error:%s", err.Error()) } - data["child_order_num"] = len(childOrders) + data["childOrderNum"] = len(childOrders) } return data diff --git a/service/staff_salary.go b/service/staff_salary.go index 650ad07..5615f99 100644 --- a/service/staff_salary.go +++ b/service/staff_salary.go @@ -148,18 +148,18 @@ func (s *StaffSalary) getCalcData(mSalary *model.StaffSalary) map[string]interfa user := make(map[string]interface{}) salary := make(map[string]interface{}) - user["username"] = s.user.Username //账户名称 - user["status"] = s.user.Status //状态 - user["entryDate"] = s.user.EntryDate //入职时间 - user["officalDate"] = s.user.OfficialDate //转正时间 - user["leaveDate"] = s.user.LeaveDate //离职时间 - user["baseSalary"] = userSalary.Base //基本工资 - user["targetSalary"] = userSalary.Target //绩效工资 - user["target"] = userConfig.PerftTarget //绩效目标 - salary["month"] = mSalary.Month //工资月份 - salary["shouldDay"] = mSalary.ShouldDay //应出勤天数 - salary["attendDay"] = mSalary.AttendDay //实际出勤天数 - salary["holidayDay"] = mSalary.HolidayDay //休假天数 + user["username"] = s.user.Username //账户名称 + user["status"] = s.user.Status //状态 + user["entryDate"] = s.user.EntryDate //入职时间 + user["officalDate"] = s.user.OfficialDate //转正时间 + user["leaveDate"] = s.user.LeaveDate //离职时间 + user["baseSalary"] = cast.ToInt(userSalary.Base) //基本工资 + user["targetSalary"] = cast.ToInt(userSalary.Target) //绩效工资 + user["target"] = userConfig.PerftTarget //绩效目标 + salary["month"] = mSalary.Month //工资月份 + salary["shouldDay"] = mSalary.ShouldDay //应出勤天数 + salary["attendDay"] = mSalary.AttendDay //实际出勤天数 + salary["holidayDay"] = mSalary.HolidayDay //休假天数 data["user"] = user data["salary"] = salary