From 3032034d254fc15f06a1d4260f35c49f0ef1e12f Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期五, 02 八月 2024 11:57:33 +0800
Subject: [PATCH] 添加接口，添加新的薪资查询和修改接口
---
service/salary_plan.go | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/service/salary_plan.go b/service/salary_plan.go
index 399be70..d93c850 100644
--- a/service/salary_plan.go
+++ b/service/salary_plan.go
@@ -696,7 +696,8 @@
// 鏍规嵁鏂规璁＄畻鍚勫伐绉嶈柂璧�
func salaryCalculate(parameter *SalaryParameter, salaryPlan *models.SalaryPlan) (string, decimal.Decimal) {
- formula := strings.ReplaceAll(salaryPlan.SalaryFormula, " ", "")
+ formula := strings.ReplaceAll(salaryPlan.SalaryFormula, ",", "")
+ formula = strings.ReplaceAll(salaryPlan.SalaryFormula, " ", "")
//var SplitFixedField = []string{"鏃ヤ骇涓濋噺", "鐢熶笣鍗曚环", "妗舵暟", "閲庣氦鏁伴噺", "閲庣氦鍗曚环", "鍚岀粍鎸¤溅宸ユ湀骞冲潎宸ヨ祫", "鍚岀粍杞﹀ご宸ュ伐璧�", "鍑哄嫟澶╂暟"}
formula = strings.Replace(formula, "鏃ヤ骇涓濋噺*鐢熶笣鍗曚环", parameter.SilkTotalAmount.String(), -1)
formula = strings.Replace(formula, "閲庣氦鏁伴噺*閲庣氦鍗曚环", parameter.BadSilkTotalAmount.String(), -1)
@@ -709,6 +710,8 @@
formula = strings.Replace(formula, "鍚岀粍杞﹀ご宸ュ伐璧�", parameter.GroupCarHeadAvgAmount.String(), -1)
formula = strings.Replace(formula, "鍑哄嫟澶╂暟", parameter.JobDays.String(), -1)
+ logx.Debugf("salary formula: %v", formula)
+
result, err := calculator.ParseAndExec(formula)
if err != nil {
logx.Errorf("%s : %v", formula, err)
--
Gitblit v1.8.0