报表查询方法修改

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -1786,6 +1786,21 @@
             结果返回用途 首次查询 0 用于比对 1 用于对比
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.StatisticsColumn.ColumnName">
+            <summary>
+            显示名
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.StatisticsColumn.OrgColumnName">
+            <summary>
+            原始名，对应到数据列
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.StatisticsColumn.Fixed">
+            <summary>
+            固定
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ReportTable.PersonnelName">
             <summary>
             人员信息

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -7405,16 +7405,6 @@
             汇总数值SQL
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.report_statistics.ProportionScript">
-            <summary>
-            占比SQL
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.report_statistics.WeightScript">
-            <summary>
-            权重SQL
-            </summary>
-        </member>
         <member name="T:Performance.EntityModels.report_statistics_selection">
             <summary>
             

performance/Performance.DtoModels/ReportStatistics/ReportStatisticsInfoDto.cs

@@ -58,7 +58,7 @@ public class StatisticsSelectionDto
         public List<TitleValue> Options { get; set; }
     }
 
-     
+
 
 
     public class StatisticsQuery
@@ -86,10 +86,22 @@ public class StatisticsColumn
     {
         public StatisticsColumn()
         {
+            ColumnName = "";
+            OrgColumnName = "";
+            Fixed = "";
             ChildColumns = new List<StatisticsColumn>();
         }
-
+        /// <summary>
+        /// 显示名
+        /// </summary>
         public string ColumnName { get; set; }
+        /// <summary>
+        /// 原始名，对应到数据列
+        /// </summary>
+        public string OrgColumnName { get; set; }
+        /// <summary>
+        /// 固定
+        /// </summary>
         public string Fixed { get; set; }
         public List<StatisticsColumn> ChildColumns { get; set; }
     }

performance/Performance.EntityModels/Entity/report_statistics.cs

@@ -35,14 +35,14 @@ public class report_statistics
         /// </summary>
         public string TotalScript { get; set; }
 
-        /// <summary>
-        /// 占比SQL
-        /// </summary>
-        public string ProportionScript { get; set; }
+        ///// <summary>
+        ///// 占比SQL
+        ///// </summary>
+        //public string ProportionScript { get; set; }
 
-        /// <summary>
-        /// 权重SQL
-        /// </summary>
-        public string WeightScript { get; set; }
+        ///// <summary>
+        ///// 权重SQL
+        ///// </summary>
+        //public string WeightScript { get; set; }
     }
 }
\ No newline at end of file