Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

controllers/company_seller.go

@@ -41,9 +41,9 @@ func (this *CompanySellerController) CheckListV2() {
 	productId := services.GetProductId(sysUser.RoleTypeCode)
 	switch productId {
 	case 1:
-		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_FICC_SELLER + `","` + utils.ROLE_TYPE_CODE_FICC_GROUP + `","` + utils.ROLE_TYPE_CODE_FICC_TEAM + `"`
+		roleCodeTypeStr = `'` + utils.ROLE_TYPE_CODE_FICC_SELLER + `','` + utils.ROLE_TYPE_CODE_FICC_GROUP + `','` + utils.ROLE_TYPE_CODE_FICC_TEAM + `'`
 	case 2:
-		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `"`
+		roleCodeTypeStr = `'` + utils.ROLE_TYPE_CODE_RAI_SELLER + `','` + utils.ROLE_TYPE_CODE_RAI_GROUP + `'`
 	}
 
 	// ficc管理员，不要只查销售
@@ -51,7 +51,7 @@ func (this *CompanySellerController) CheckListV2() {
 		roleCodeTypeStr = ``
 	} else if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 		// 权益管理员，查看所有权益的账号
-		roleCodeTypeStr = `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_RESEARCHR + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
+		roleCodeTypeStr = `'` + utils.ROLE_TYPE_CODE_RAI_SELLER + `','` + utils.ROLE_TYPE_CODE_RAI_GROUP + `','` + utils.ROLE_TYPE_CODE_RAI_RESEARCHR + `','` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `'`
 	}
 
 	getAllSeller, _ := this.GetBool("AllSeller", false)

controllers/target.go

@@ -2173,7 +2173,7 @@ func (this *TargetController) TargetItemList() {
 	frequencyList = sortEdbFrequency(frequencyList)
 
 	if len(edbTradeCodeList) > 0 {
-		edbTradeCodeStr := `"` + strings.Join(edbTradeCodeList, `","`) + `"`
+		edbTradeCodeStr := `'` + strings.Join(edbTradeCodeList, `','`) + `'`
 		edbDataList, err := models.GetEdbDataListByCodes(edbTradeCodeStr)
 		if err != nil {
 			br.ErrMsg = "获取指标数据失败，Err:" + err.Error()
@@ -2610,7 +2610,7 @@ func (this *TargetController) BatchDataDeleteByDate() {
 		return
 	}
 
-	TradeCodeStr := `"` + strings.Join(req.TradeCodeList, `","`) + `"`
+	TradeCodeStr := `'` + strings.Join(req.TradeCodeList, `','`) + `'`
 
 	//删除数据
 	err = models.BatchDeleteEdbDataByDate(TradeCodeStr, req.CreateDate, this.SysUser.AdminId)

global/initDb.go

@@ -13,6 +13,7 @@ import (
 	"io"
 	"log"
 	"os"
+	"strings"
 	"time"
 )
 
@@ -78,6 +79,9 @@ func connectDb(dsn, aliasName string, newLogger logger.Interface, dbMap map[stri
 	var dialector gorm.Dialector
 	switch utils.DbDriverName {
 	case utils.DbDriverByMysql:
+		if !strings.Contains(dsn, `parseTime`) {
+			dsn += `&parseTime=true`
+		}
 		dialector = mysql.Open(dsn)
 	case utils.DbDriverByDm:
 		dialector = dm.Open(dsn)

models/data_manage/chart_edb_mapping.go

@@ -339,8 +339,8 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 		for _, v := range removeMapping {
 			removeIdList = append(removeIdList, fmt.Sprint(v))
 		}
-		removeIdStr := strings.Join(removeIdList, `","`)
-		removeIdStr = `"` + removeIdStr + `"`
+		removeIdStr := strings.Join(removeIdList, `','`)
+		removeIdStr = `'` + removeIdStr + `'`
 		//如果拼接指标变更了，那么需要删除所有的指标数据
 		sql := fmt.Sprintf(` DELETE FROM chart_edb_mapping WHERE chart_edb_mapping_id in (%s) `, removeIdStr)
 

models/data_manage/chart_info.go

@@ -160,7 +160,7 @@ func GetChartInfoViewById(chartInfoId int) (item *ChartInfoView, err error) {
 
 func GetChartInfoViewByIds(chartInfoIds []string) (list []*ChartInfoView, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	sql := ` SELECT * FROM chart_info WHERE chart_info_id in ("` + strings.Join(chartInfoIds, `","`) + `") `
+	sql := ` SELECT * FROM chart_info WHERE chart_info_id in ('` + strings.Join(chartInfoIds, `','`) + `') `
 	err = o.Raw(sql).Find(&list).Error
 	return
 }
@@ -1936,24 +1936,24 @@ type ChartInfoView struct {
 	Sort              int    `description:"排序字段，数字越小越排前面"`
 	IsAdd             bool   `description:"true:已加入我的图库,false:未加入我的图库"`
 	MyChartId         int
-	MyChartClassifyId string `description:"我的图表分类，多个用逗号隔开"`
+	MyChartClassifyId string               `description:"我的图表分类，多个用逗号隔开"`
 	ChartClassify     []*ChartClassifyView `description:"图表分类" gorm:"-"`
-	EdbEndDate        string `description:"指标最新更新日期"`
-	XMin              string `description:"图表X轴最小值"`
-	XMax              string `description:"图表X轴最大值"`
-	LeftMin           string `description:"图表左侧最小值"`
-	LeftMax           string `description:"图表左侧最大值"`
-	RightMin          string `description:"图表右侧最小值"`
-	RightMax          string `description:"图表右侧最大值"`
-	Right2Min         string `description:"图表右侧最小值"`
-	Right2Max         string `description:"图表右侧最大值"`
-	MinMaxSave        int    `description:"是否手动保存过上下限：0-否；1-是"`
-	IsEdit            bool   `description:"是否有编辑权限"`
-	IsEnChart         bool   `description:"是否展示英文标识"`
-	WarnMsg           string `description:"错误信息"`
-	Disabled          int    `description:"是否禁用，0：启用，1：禁用，默认：0"`
-	BarConfig         string `description:"柱方图的配置，json数据" json:"-"`
-	Source            int    `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
+	EdbEndDate        string               `description:"指标最新更新日期"`
+	XMin              string               `description:"图表X轴最小值"`
+	XMax              string               `description:"图表X轴最大值"`
+	LeftMin           string               `description:"图表左侧最小值"`
+	LeftMax           string               `description:"图表左侧最大值"`
+	RightMin          string               `description:"图表右侧最小值"`
+	RightMax          string               `description:"图表右侧最大值"`
+	Right2Min         string               `description:"图表右侧最小值"`
+	Right2Max         string               `description:"图表右侧最大值"`
+	MinMaxSave        int                  `description:"是否手动保存过上下限：0-否；1-是"`
+	IsEdit            bool                 `description:"是否有编辑权限"`
+	IsEnChart         bool                 `description:"是否展示英文标识"`
+	WarnMsg           string               `description:"错误信息"`
+	Disabled          int                  `description:"是否禁用，0：启用，1：禁用，默认：0"`
+	BarConfig         string               `description:"柱方图的配置，json数据" json:"-"`
+	Source            int                  `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
 	//CorrelationLeadUnit string `description:"相关性图表-领先单位"`
 	ExtraConfig       string          `description:"图表额外配置,json数据"`
 	ChartSource       string          `description:"图表来源str"`
@@ -2018,7 +2018,7 @@ func GetChartInfoListByUniqueCodeSlice(uniqueCodeSlice []string) (total int64, i
 		return
 	}
 	o := global.DbMap[utils.DbNameIndex]
-	sql := ` SELECT * FROM chart_info WHERE unique_code in ("` + strings.Join(uniqueCodeSlice, `","`) + `") `
+	sql := ` SELECT * FROM chart_info WHERE unique_code in ('` + strings.Join(uniqueCodeSlice, `','`) + `') `
 	err = o.Raw(sql).Find(&items).Error
 	total = int64(len(items))
 	return