Browse Source

移除查询中的额外字段配置移除了my_chart和sandbox_classify查询中不必要的字段配置,如bar_config、extra_config等,以及sources_from、instructions等字段。这些字段在当前上下文中可能不再需要,移除它们可以简化查询,提高性能,并减少数据传输量。

Roc 5 months ago
parent
commit
67aec330d9
2 changed files with 7 additions and 7 deletions
  1. 6 6
      models/data_manage/my_chart.go
  2. 1 1
      models/sandbox/sandbox_classify.go

+ 6 - 6
models/data_manage/my_chart.go

@@ -1149,16 +1149,16 @@ func GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition(condition string, par
 	//}
 	//sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
 
-	sql := `SELECT a.admin_id,a.my_chart_id,c.sort,b.chart_info_id, b.chart_name, b.unique_code, b.chart_classify_id, b.sys_user_id, b.sys_user_real_name, b.create_time, b.modify_time, b.date_type, b.start_date, b.end_date, b.is_set_name, b.edb_info_ids, b.chart_type, b.calendar, b.season_start_date, b.season_end_date, b.chart_image, b.sort, b.edb_end_date, b.x_min, b.x_max, b.left_min, b.left_max, b.right_min, b.right_max, b.right2_min, b.right2_max, b.min_max_save, b.chart_name_en, b.disabled, b.bar_config, b.source, b.extra_config, b.season_extra_config, b.start_year, b.chart_theme_id, b.sources_from, b.instructions, b.markers_lines, b.markers_areas, b.unit, b.unit_en, b.is_join_permission, b.forum_chart_info_id, b.chart_alias, b.date_type_num,LISTAGG(DISTINCT d.my_chart_classify_name, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_name) AS my_chart_classify_name,LISTAGG(d.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_id) AS my_chart_classify_id
-FROM  "eta_index".my_chart AS a
-INNER JOIN "eta_index".chart_info AS b ON a.chart_info_id=b.chart_info_id
-INNER JOIN "eta_index".my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
-INNER JOIN "eta_index".my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
+	sql := `SELECT a.admin_id,a.my_chart_id,c.sort,b.chart_info_id, b.chart_name, b.unique_code, b.chart_classify_id, b.sys_user_id, b.sys_user_real_name, b.create_time, b.modify_time, b.date_type, b.start_date, b.end_date, b.is_set_name, b.edb_info_ids, b.chart_type, b.calendar, b.season_start_date, b.season_end_date, b.chart_image, b.sort, b.edb_end_date, b.x_min, b.x_max, b.left_min, b.left_max, b.right_min, b.right_max, b.right2_min, b.right2_max, b.min_max_save, b.chart_name_en, b.disabled, b.source,  b.start_year, b.chart_theme_id,  b.unit, b.unit_en, b.is_join_permission, b.forum_chart_info_id, b.chart_alias, b.date_type_num,LISTAGG(DISTINCT d.my_chart_classify_name, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_name) AS my_chart_classify_name,LISTAGG(d.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY d.my_chart_classify_id) AS my_chart_classify_id
+FROM  my_chart AS a
+INNER JOIN chart_info AS b ON a.chart_info_id=b.chart_info_id
+INNER JOIN my_chart_classify_mapping AS c ON a.my_chart_id=c.my_chart_id
+INNER JOIN my_chart_classify AS d ON c.my_chart_classify_id=d.my_chart_classify_id
 WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	sql += " GROUP BY a.chart_info_id,a.admin_id,c.sort,a.my_chart_id,b.chart_info_id, b.chart_name, b.unique_code, b.chart_classify_id, b.sys_user_id, b.sys_user_real_name, b.create_time, b.modify_time, b.date_type, b.start_date, b.end_date, b.is_set_name, b.edb_info_ids, b.chart_type, b.calendar, b.season_start_date, b.season_end_date, b.chart_image, b.sort, b.edb_end_date, b.x_min, b.x_max, b.left_min, b.left_max, b.right_min, b.right_max, b.right2_min, b.right2_max, b.min_max_save, b.chart_name_en, b.disabled, b.bar_config, b.source, b.extra_config, b.season_extra_config, b.start_year, b.chart_theme_id, b.sources_from, b.instructions, b.markers_lines, b.markers_areas, b.unit, b.unit_en, b.is_join_permission, b.forum_chart_info_id, b.chart_alias, b.date_type_num" +
+	sql += " GROUP BY a.chart_info_id,a.admin_id,c.sort,a.my_chart_id,b.chart_info_id, b.chart_name, b.unique_code, b.chart_classify_id, b.sys_user_id, b.sys_user_real_name, b.create_time, b.modify_time, b.date_type, b.start_date, b.end_date, b.is_set_name, b.edb_info_ids, b.chart_type, b.calendar, b.season_start_date, b.season_end_date, b.chart_image, b.sort, b.edb_end_date, b.x_min, b.x_max, b.left_min, b.left_max, b.right_min, b.right_max, b.right2_min, b.right2_max, b.min_max_save, b.chart_name_en, b.disabled,  b.source,  b.start_year, b.chart_theme_id,  b.unit, b.unit_en, b.is_join_permission, b.forum_chart_info_id, b.chart_alias, b.date_type_num" +
 		" ORDER BY c.sort DESC "
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return

+ 1 - 1
models/sandbox/sandbox_classify.go

@@ -324,7 +324,7 @@ func GetSandboxClassifySubcategories(classifyId int) (Ids string, err error) {
     FROM DUAL  
     UNION ALL  
     SELECT sc.sandbox_classify_id  
-    FROM "eta_index".sandbox_classify sc  
+    FROM sandbox_classify sc  
     JOIN Subcategories s  
     ON sc.parent_id = s.sandbox_classify_id  
 )