Merge remote-tracking branch 'origin/eta/2.0.0' into debug

controllers/data_manage/manual_edb.go

@@ -517,6 +517,24 @@ func (c *ManualEdbController) EditExcelData() {
 			updateCols := make([]string, 0)
 
 			if manualEdbInfo.SecName != secName {
+				// 校验是否存在相同指标名称
+				var condition string
+				var pars []interface{}
+				condition += " AND SEC_NAME=? AND left(TRADE_CODE,1)='W' AND REMARK='手动' AND TRADE_CODE != ? "
+				pars = append(pars, secName, req.TradeCode)
+				count, err := models.GetManualEdbCountByCondition(condition, pars)
+				if err != nil {
+					br.Msg = `指标保存失败`
+					br.ErrMsg = `获取同名指标信息异常，ERR:` + err.Error()
+					return
+				}
+				if count > 0 {
+					br.Msg = `已存在同名指标`
+					br.ErrMsg = `已存在同名指标`
+					br.IsSendEmail = false
+					return
+				}
+
 				updateCols = append(updateCols, "SecName")
 				manualEdbInfo.SecName = secName
 			}
@@ -543,7 +561,7 @@ func (c *ManualEdbController) EditExcelData() {
 				err = manualEdbInfo.Update(updateCols)
 				if err != nil {
 					br.Msg = `指标保存失败`
-					br.Msg = `指标保存失败，ERR:` + err.Error()
+					br.ErrMsg = `指标保存失败，ERR:` + err.Error()
 					return
 				}
 			}

models/manual_edb.go

@@ -358,3 +358,21 @@ func GetEdbinfoOpRecordPageList(tradeCode string, startSize, pageSize int) (tota
 
 	return
 }
+
+// GetManualEdbCountByCondition
+// @Description: 根据获取手工数据条数
+// @author: Roc
+// @datetime 2024-08-05 09:37:16
+// @param condition string
+// @param pars []interface{}
+// @return count int
+// @return err error
+func GetManualEdbCountByCondition(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("edb")
+	sql := ` SELECT COUNT(1) AS count FROM edbinfo WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}