汾渭数据源对接-excel导出逻辑修改

controllers/data_manage/fenwei_data.go

@@ -811,7 +811,7 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 	classifyId, _ := this.GetInt("ClassifyId") //分类
 	indexCode := this.GetString("IndexCode")   //指标唯一编码
 
-	if classifyId < 0 {
+	if classifyId <= 0 {
 		br.Msg = "请选择分类"
 		return
 	}
@@ -867,7 +867,11 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 		}
 		var sheet *xlsx.Sheet
 		if len(fenWeiIndices) > 0 {
-			sheet, err = xlsxFile.AddSheet(*frequency)
+			sheetName := *frequency
+			if sheetName == "" {
+				sheetName = "无频度"
+			}
+			sheet, err = xlsxFile.AddSheet(sheetName)
 			if err != nil {
 				br.Msg = "新增Sheet失败"
 				br.ErrMsg = "新增Sheet失败,Err:" + err.Error()
@@ -905,7 +909,8 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 			celUnit := rowUnit.AddCell()
 			celUnit.SetValue(v.Unit)
 			rowModifyCell := rowModifyDate.AddCell()
-			rowModifyCell.SetValue(v.ModifyTime)
+			updateTimeStr := utils.TimeToStr(v.ModifyTime, utils.FormatDate)
+			rowModifyCell.SetValue(updateTimeStr)
 			tradeCodeList = append(tradeCodeList, v.IndexCode)
 
 			var dataList []*data_manage.BaseFromFenweiData

models/data_manage/base_from_fenwei.go

@@ -188,11 +188,11 @@ func GetBaseFromFenweiIndexByIndexCode(indexCode string) (list *BaseFromFenweiIn
 func GetFenWeiIndexFrequency(classifyId int) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency 
         FROM base_from_fenwei_index 
-        WHERE frequency != ''`
+        WHERE frequency is not null`
 
 	// 如果 classifyId > 0，则添加该条件
 	if classifyId > 0 {
-		sql += ` AND base_from_ly_classify_id = ?`
+		sql += ` AND classify_id = ?`
 	}
 
 	sql += ` ORDER BY FIELD(frequency, '日度', '周度', '月度', '季度', '半年度', '年度')`
@@ -213,8 +213,8 @@ func GetFenWeiIndexByCodeAndClassify(indexCode string, classifyId int, frequency
 
 	// SQL 查询语句
 	sql := `SELECT a.index_code, a.index_name, a.frequency, a.unit, MAX(b.modify_time) AS modify_time
-			FROM base_from_ly_index AS a
-			INNER JOIN base_from_ly_data AS b ON a.base_from_ly_index_id = b.base_from_ly_index_id
+			FROM base_from_fenwei_index AS a
+			INNER JOIN base_from_fenwei_data AS b ON a.fenwei_index_id = b.fenwei_index_id
 			WHERE 1=1`
 
 	var params []interface{}
@@ -246,7 +246,7 @@ func GetFenWeiIndexByCodeAndClassify(indexCode string, classifyId int, frequency
 
 // GetBaseFromFenWeiDataByIndexCode 根据指标编码查询
 func GetBaseFromFenWeiDataByIndexCode(indexCode string) (items []*BaseFromFenweiData, err error) {
-	sql := `SELECT * FROM base_from_ly_data WHERE index_code=? ORDER BY data_time desc`
+	sql := `SELECT * FROM base_from_fenwei_data WHERE index_code=? ORDER BY data_time desc`
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql, indexCode).QueryRows(&items)
 	return
@@ -254,7 +254,7 @@ func GetBaseFromFenWeiDataByIndexCode(indexCode string) (items []*BaseFromFenwei
 
 // GetFenWeiDataListByIndexCodes 根据指标编码查询
 func GetFenWeiDataListByIndexCodes(IndexCodes string) (items []string, err error) {
-	sql := ` SELECT data_time FROM base_from_ly_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
+	sql := ` SELECT data_time FROM base_from_fenwei_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

utils/common.go

@@ -727,6 +727,11 @@ func StrTimeToTime(strTime string) time.Time {
 	return resultTime
 }
 
+// TimeToStr time.Time 转 字符串 yyyy-MM-dd
+func TimeToStr(data time.Time, format string) string {
+	return data.Format(format)
+}
+
 // 字符串类型时间转周几
 func StrDateTimeToWeek(strTime string) string {
 	var WeekDayMap = map[string]string{