no message

models/data_manage/chart_info.go

@@ -42,10 +42,15 @@ func GetAllChartInfo() (list []*ChartInfo, err error) {
 
 func GetChartInfoEdbEndDate() (list []*ChartInfo, err error) {
 	//o := orm.NewOrm()
-	sql := ` SELECT a.*,max(c.end_date) AS edb_end_date FROM  chart_info  AS a
+	//sql := ` SELECT a.*,max(c.end_date) AS edb_end_date FROM  chart_info  AS a
+	//		INNER JOIN chart_edb_mapping AS b ON a.chart_info_id=b.chart_info_id
+	//		INNER JOIN edb_info AS c ON b.edb_info_id=c.edb_info_id
+	//		GROUP BY a.chart_info_id  `
+
+	sql := `SELECT a.chart_info_id, a.chart_name, a.unique_code, a.chart_classify_id, a.sys_user_id, a.sys_user_real_name, a.create_time, a.modify_time, a.date_type, a.start_date, a.end_date, a.is_set_name, a.edb_info_ids, a.chart_type, a.calendar, a.season_start_date, a.season_end_date, a.chart_image, a.sort, a.edb_end_date, a.x_min, a.x_max, a.left_min, a.left_max, a.right_min, a.right_max, a.right2_min, a.right2_max, a.min_max_save, a.chart_name_en, a.disabled, a.bar_config, a.source, a.extra_config, a.season_extra_config, a.start_year, a.chart_theme_id, a.sources_from, a.instructions, a.markers_lines, a.markers_areas, a.unit, a.unit_en, a.is_join_permission, a.forum_chart_info_id, a.chart_alias, a.date_type_num,max(c.end_date) AS edb_end_date FROM  chart_info  AS a
 			INNER JOIN chart_edb_mapping AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN edb_info AS c ON b.edb_info_id=c.edb_info_id
-			GROUP BY a.chart_info_id  `
+			GROUP BY a.chart_info_id, a.chart_name, a.unique_code, a.chart_classify_id, a.sys_user_id, a.sys_user_real_name, a.create_time, a.modify_time, a.date_type, a.start_date, a.end_date, a.is_set_name, a.edb_info_ids, a.chart_type, a.calendar, a.season_start_date, a.season_end_date, a.chart_image, a.sort, a.edb_end_date, a.x_min, a.x_max, a.left_min, a.left_max, a.right_min, a.right_max, a.right2_min, a.right2_max, a.min_max_save, a.chart_name_en, a.disabled, a.bar_config, a.source, a.extra_config, a.season_extra_config, a.start_year, a.chart_theme_id, a.sources_from, a.instructions, a.markers_lines, a.markers_areas, a.unit, a.unit_en, a.is_join_permission, a.forum_chart_info_id, a.chart_alias, a.date_type_num `
 	//_, err = o.Raw(sql).QueryRows(&list)
 
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error

models/data_manage/edb_data_gl.go

@@ -35,7 +35,8 @@ func GetGlDataByTradeCode(condition string, pars []interface{}) (item []*GlData,
 	if condition != "" {
 		sql1 += condition
 	}
-	sql := `select * from (` + sql1 + ` having 1 order by PUBLISH_TIME DESC ) tmp group by DATA_DATE ORDER BY PUBLISH_TIME DESC `
+	//sql := `select * from (` + sql1 + ` having 1 order by PUBLISH_TIME DESC ) tmp group by DATA_DATE ORDER BY PUBLISH_TIME DESC `
+	sql := `select MS_ID, INDEX_CODE, DATA_VALUE, DATA_DATE, PUBLISH_TIME, UPDATE_TIME, IS_DELETE from (` + sql1 + ` having 1 order by PUBLISH_TIME DESC ) tmp group by MS_ID, INDEX_CODE, DATA_VALUE, DATA_DATE, PUBLISH_TIME, UPDATE_TIME, IS_DELETE ORDER BY PUBLISH_TIME DESC `
 
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 

models/data_manage/trade_position_analysis.go

@@ -400,7 +400,7 @@ func GetExchangeClassify(exchange string) (list []TradeClassifyName, err error)
 	if exchange == "zhengzhou" {
 		orderStr = "classify_name asc"
 	}
-	sql := `SELECT classify_name, classify_type,MAX(data_time) as data_time,MAX(modify_time) as modify_time FROM ` + tableName + ` GROUP BY classify_name, classify_type  `
+	sql := `SELECT classify_name, classify_type,MAX(data_time) as data_time,MAX(modify_time) as modify_time FROM ` + tableName + ` GROUP BY classify_name, classify_type ,data_time , modify_time  `
 	sql += ` ORDER BY ` + orderStr
 
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&list).Error

models/wx_template_msg.go

@@ -54,7 +54,7 @@ func GetOpenIdArr() (items []string, err error) {
 	     INNER JOIN company AS c ON c.company_id = wu.company_id
 	     INNER JOIN company_product AS d ON c.company_id=d.company_id
 		INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-	     WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
+	     WHERE ur.open_id != '' AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
 	    ORDER BY FIELD(c.company_id, 16) desc, ur.user_record_id asc`
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return