Pārlūkot izejas kodu

跟产品确认后:1、导出的excel表里不要合计这一栏, 2、导出的结果里热点名称这列只显示一级热点名称(和老系统保持一致) 20250410 昌建

田爽 2 nedēļas atpakaļ
vecāks
revīzija
2fe99acd03

+ 13 - 12
src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -3036,32 +3036,33 @@ namespace Hotline.Application.StatisticalReport
             .ToListAsync();
             data = list.ToDataTable("HotspotStatistics");
 
-			data.Columns["HotspotName"].SetOrdinal(0);
+			data.Columns["Name"].SetOrdinal(0);
             data.Columns["OneHotspotName"].SetOrdinal(1);
 			data.Columns["TwoHotspotName"].SetOrdinal(2);
 			data.Columns["ThreeHotspotName"].SetOrdinal(3);
 			data.Columns["FourHotspotName"].SetOrdinal(4);
 			data.Columns["FiveHotspotName"].SetOrdinal(5);
 			data.Columns["SumCount"].ColumnName = "分类统计";
-            data.Columns["HotspotName"].ColumnName = "热点名称";
+            data.Columns["Name"].ColumnName = "热点名称";
 			data.Columns["OneHotspotName"].ColumnName = "一级热点";
 			data.Columns["TwoHotspotName"].ColumnName = "二级热点";
 			data.Columns["ThreeHotspotName"].ColumnName = "三级热点";
 			data.Columns["FourHotspotName"].ColumnName = "四级热点";
 			data.Columns["FiveHotspotName"].ColumnName = "五级热点";
 			data.Columns.Remove("HotSpotFullName");
+			data.Columns.Remove("HotspotName");
 			//data.Columns["HotSpotFullName"].ColumnName = "热点分级";
 			//合计
-			DataRow sumRow = data.NewRow();
-            sumRow["热点名称"] = "合计";
-            decimal totalAmount = 0;
-            foreach (DataRow row in data.Rows)
-            {
-                totalAmount += Convert.ToDecimal(row["分类统计"]);
-            }
-            sumRow["分类统计"] = totalAmount;
-            data.Rows.Add(sumRow);
-            return data;
+			//DataRow sumRow = data.NewRow();
+			//         sumRow["热点名称"] = "合计";
+			//         decimal totalAmount = 0;
+			//         foreach (DataRow row in data.Rows)
+			//         {
+			//             totalAmount += Convert.ToDecimal(row["分类统计"]);
+			//         }
+			//         sumRow["分类统计"] = totalAmount;
+			//         data.Rows.Add(sumRow);
+			return data;
         }
     }
 }

+ 9 - 4
src/Hotline.Share/Dtos/StatisticalReport/OrderDelayStatisicalReturnDto.cs

@@ -57,10 +57,15 @@ namespace Hotline.Share.Dtos.StatisticalReport
         /// </summary>
         public string HotSpotFullName { get; set; }
 
-        /// <summary>
-        /// 一级热点
-        /// </summary>
-        public string OneHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 1 && HotSpotFullName.Split("-")[0] == HotspotName ? HotSpotFullName.Split("-")[0] : string.Empty;
+		/// <summary>
+		/// 热点名称
+		/// </summary>
+		public string Name => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 1 && HotSpotFullName.Split("-")[0] == HotspotName ? HotSpotFullName.Split("-")[0] : string.Empty;
+
+		/// <summary>
+		/// 一级热点
+		/// </summary>
+		public string OneHotspotName => !string.IsNullOrEmpty(HotSpotFullName) && HotSpotFullName.Split("-").Length >= 1 && HotSpotFullName.Split("-")[0] == HotspotName ? HotSpotFullName.Split("-")[0] : string.Empty;
 
         /// <summary>
         /// 二级热点