|
@@ -4,13 +4,15 @@ import (
|
|
|
"encoding/json"
|
|
|
"eta_gn/eta_api/models"
|
|
|
"eta_gn/eta_api/services"
|
|
|
+ biapprove "eta_gn/eta_api/services/bi_approve"
|
|
|
"eta_gn/eta_api/utils"
|
|
|
"fmt"
|
|
|
- "github.com/shopspring/decimal"
|
|
|
"html"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
+
|
|
|
+ "github.com/shopspring/decimal"
|
|
|
)
|
|
|
|
|
|
// BusinessConfController 商家配置
|
|
@@ -66,6 +68,7 @@ func (this *BusinessConfController) Save() {
|
|
|
|
|
|
openApprove := ""
|
|
|
approveType := ""
|
|
|
+ curBiAprrove := ""
|
|
|
|
|
|
// 根据配置类型取值
|
|
|
updates := make([]models.BusinessConfUpdate, 0)
|
|
@@ -103,6 +106,9 @@ func (this *BusinessConfController) Save() {
|
|
|
}
|
|
|
approveType = str
|
|
|
}
|
|
|
+ if k == models.BusinessConfIsBIApprove {
|
|
|
+ curBiAprrove = str
|
|
|
+ }
|
|
|
case 2: // 数值
|
|
|
vDeci, err := decimal.NewFromString(fmt.Sprint(v))
|
|
|
if err != nil {
|
|
@@ -191,6 +197,21 @@ func (this *BusinessConfController) Save() {
|
|
|
go services.ConfigChangeResetReportState(changeType)
|
|
|
}
|
|
|
}
|
|
|
+ if curBiAprrove != "" {
|
|
|
+ oldBiApprove := confMap[models.BusinessConfIsBIApprove]
|
|
|
+ if oldBiApprove != nil && oldBiApprove.ConfVal != curBiAprrove && oldBiApprove.ConfVal == "true" && curBiAprrove == "false" {
|
|
|
+ ok, err := biapprove.CheckHasApprovingBi()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "保存失败"
|
|
|
+ br.ErrMsg = "校验是否有正在审批的BI失败, Err: " + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if ok {
|
|
|
+ br.Msg = "当前有未走完流程的看板,请走完流程后再做变更"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if len(updates) > 0 {
|
|
|
if e = models.UpdateBusinessConfMulti(updates); e != nil {
|