合并分支 'test' 到 'master'

Test



查看合并请求 !14

+ELF
\ No newline at end of file

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/constant"
 	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
 )
 
@@ -48,9 +49,9 @@ func (notices notifyStaffAssess) makeNotify(param *domain.StaffAssess) *domain.L
 
 // ifSend 确认是否发送通知
 func (notices notifyStaffAssess) ifSend(index int) (bool, error) {
-	// if constant.Env != "prd" {
-	// 	return false, nil
-	// }
+	if constant.Env != "prd" {
+		return false, nil
+	}
 
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
@@ -123,9 +124,9 @@ func (notices notifyStaffAssess2) makeNotify(param *domain.StaffAssess) *domain.
 
 // ifSend 确认是否发送通知
 func (notices notifyStaffAssess2) ifSend(index int) (bool, error) {
-	// if constant.Env != "prd" {
-	// 	return false, nil
-	// }
+	if constant.Env != "prd" {
+		return false, nil
+	}
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 		return false, err

@@ -16,6 +16,7 @@ import (
 	"golang.org/x/text/transform"
 	"io"
 	"io/ioutil"
+	"math"
 	"mime/multipart"
 	"os"
 	"path"
@@ -168,7 +169,7 @@ func (controller *ImportController) parseTemplateNodeContent(data []*domain.Perf
 			nodeContents = append(nodeContents, nc)
 		}
 	}
-
+	weightTotal = math.Round(weightTotal*100) / 100
 	// 权重总数不等于100%，提示报错
 	if weightTotal != 100 {
 		sprintf := fmt.Sprintf("当前导入的总权重值为：%s%%（必须等于100%%）", utils.FormatFloatDecimal(weightTotal, 2))