expression
This commit is contained in:
parent
b7613a4d68
commit
27aa9da8e8
|
@ -92,14 +92,18 @@ func (s *StaffSalary) calculate(corp *model.Corp, salary *model.StaffSalary) {
|
||||||
//获取计算器表达式
|
//获取计算器表达式
|
||||||
calculator, _ := dao.NewSalaryCalculatorDao().Get(cast.ToInt64(s.user.GetSalary().Calculator))
|
calculator, _ := dao.NewSalaryCalculatorDao().Get(cast.ToInt64(s.user.GetSalary().Calculator))
|
||||||
if calculator == nil {
|
if calculator == nil {
|
||||||
log.Errorf("calculator[%d] is nil", s.user.GetSalary().Calculator)
|
log.Errorf("calculator[%s] is nil", s.user.GetSalary().Calculator)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//执行表达式
|
//执行表达式
|
||||||
jsrun := otto.New()
|
jsrun := otto.New()
|
||||||
jsrun.Set("data", data)
|
jsrun.Set("data", data)
|
||||||
jsrun.Run(calculator.Expression)
|
_, err := jsrun.Run(calculator.Expression)
|
||||||
|
if calculator == nil {
|
||||||
|
log.Errorf("Run[%s] error :%s", calculator.Expression, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
//出勤工资
|
//出勤工资
|
||||||
attendSalary, err := jsrun.Get("attend_salary")
|
attendSalary, err := jsrun.Get("attend_salary")
|
||||||
|
|
Loading…
Reference in New Issue