change gorm

controllers/base_from_baiinfo.go

@@ -111,7 +111,7 @@ func (this *BaiinfoController) Refresh() {
 		req.EdbInfoId = edbInfo.EdbInfoId
 	}
 	err = models.RefreshEdbDataFromBaiinfo(req.EdbInfoId, req.EdbCode, req.StartDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromBaiinfo，Err:" + err.Error()
 		return

controllers/base_from_bloomberg.go

@@ -121,7 +121,7 @@ func (this *BloombergController) Refresh() {
 	dataUpdateTime := time.Now().Format(utils.FormatDateTime)
 	utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 	err = models.RefreshEdbDataFromBloomberg(req.EdbInfoId, req.EdbCode, req.StartDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromBloomberg，Err:" + err.Error()
 		return

controllers/base_from_business.go

@@ -470,7 +470,7 @@ func (c *BusinessIndexController) Refresh() {
 		br.ErrMsg = "刷新指标失败，err:" + errMsg
 		return
 	}
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 BusinessIndexController，Err:" + err.Error()
 		return

controllers/base_from_calculate.go

@@ -898,7 +898,7 @@ func (this *CalculateController) BatchEdit() {
 
 	edbInfo, err := models.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标已被删除，请刷新页面"
 			br.ErrMsg = "指标已被删除，请刷新页面:Err:" + err.Error()
 			return
@@ -1055,7 +1055,7 @@ func (this *CalculateController) BatchEdit() {
 		err = models.EditCalculateNszydpjjs(edbInfo, &req, fromEdbInfo, formulaInt, edbInfo.CalculateFormula)
 	case utils.DATA_SOURCE_CALCULATE_HBZ:
 		checkCount, tmpErr := models.GetLteZeroEdbDataCount(fromEdbInfo.Source, fromEdbInfo.SubSource, req.FromEdbInfoId)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			br.Msg = "判断环比值是否可计算失败"
 			br.ErrMsg = "判断环比值是否可计算失败,Err:" + tmpErr.Error()
 			return

controllers/base_from_cffex.go

@@ -108,7 +108,7 @@ func (this *CffexController) Refresh() {
 	}
 
 	err = models.RefreshEdbDataFromCffex(req.EdbInfoId, req.EdbCode, req.StartDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromCffex，Err:" + err.Error()
 		return

controllers/base_from_clarksons.go

@@ -40,7 +40,7 @@ func (this *ClarksonsDataController) ClarksonsData() {
 	//var indexMap = make(map[string]string)
 	var itemsIndex []*models.BaseFromClarksonsData
 	codeList, err := models.GetBaseFromClarksonsIndex()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		utils.FileLog.Info("获取克拉克森指标失败：", err)
 		return
 	}
@@ -285,7 +285,7 @@ func (this *ClarksonsDataController) Refresh() {
 	}
 
 	err = models.RefreshEdbDataFromClarksons(req.EdbInfoId, req.EdbCode, req.StartDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromCoal，Err:" + err.Error()
 		return

controllers/base_from_coal.go

@@ -107,7 +107,7 @@ func (this *CoalController) Refresh() {
 	}
 
 	err = models.RefreshEdbDataFromCoal(req.EdbInfoId, req.EdbCode, req.StartDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromCoal，Err:" + err.Error()
 		return

controllers/base_from_ths.go

@@ -121,7 +121,7 @@ func (this *ThsController) Refresh() {
 		return
 	}
 	err = models.RefreshEdbDataFromThs(req.EdbInfoId, req.EdbCode, utils.GetEdbRefreshStartDate(req.StartDate), dataItem)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromThs，Err:" + err.Error()
 		return

controllers/base_from_usda_fas.go

@@ -119,7 +119,7 @@ func (this *UsdaFasController) Refresh() {
 		req.EdbInfoId = edbInfo.EdbInfoId
 	}
 	err = usdaFas.Refresh(req.EdbInfoId, req.EdbCode, req.StartDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromusdaFas，Err:" + err.Error()
 		return

controllers/edb_info.go

@@ -85,7 +85,7 @@ func (this *EdbInfoController) Add() {
 	var isAdd bool
 	item, err := models.GetEdbInfoByEdbCode(req.Source, req.EdbCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			isAdd = true
 		} else {
 			br.Msg = "判断指标是否存在失败！"

utils/common.go

@@ -1078,13 +1078,13 @@ func GetFrequencyEndDay(currDate time.Time, frequency string) (endDate time.Time
 // 小于0，代表右侧是高频(例：左侧：周度，右侧：日度）
 func CheckFrequency(leftFrequency, rightFrequency string) int {
 	frequencyMap := map[string]int{
-		"年度":   0,
+		"年度":  0,
 		"半年度": 1,
-		"季度":   2,
-		"月度":   3,
-		"旬度":   4,
-		"周度":   5,
-		"日度":   6,
+		"季度":  2,
+		"月度":  3,
+		"旬度":  4,
+		"周度":  5,
+		"日度":  6,
 	}
 
 	return frequencyMap[leftFrequency] - frequencyMap[rightFrequency]