src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -260,7 +260,8 @@ namespace Hotline.Repository.SqlSugar.Orders
 
             //修改列名
             dt.Columns["Hour"].ColumnName = "时间段";
-            dt.Columns.Remove("Column1");
+            if (dt.Columns.Contains("Column1"))
+                dt.Columns.Remove("Column1");
 
             //增加小计
             DataColumn totalColumn = new DataColumn("小计", typeof(decimal));
@@ -408,7 +409,8 @@ namespace Hotline.Repository.SqlSugar.Orders
 
             //修改列名
             dt.Columns["Hour"].ColumnName = "时间段";
-            dt.Columns.Remove("Column1");
+            if (dt.Columns.Contains("Column1"))
+                dt.Columns.Remove("Column1");
 
             //增加小计
             DataColumn totalColumn = new DataColumn("小计", typeof(decimal));
@@ -479,7 +481,7 @@ namespace Hotline.Repository.SqlSugar.Orders
 
             var listOrg = Db.Queryable<SystemDicData>()
               .LeftJoin(listOrder, (s, p) => s.DicDataValue == p.AcceptTypeCode)
-              .Where((s, p) => s.DicTypeCode== "AcceptType")
+              .Where((s, p) => s.DicTypeCode == "AcceptType")
               .GroupBy((s, p) => s.DicDataValue).GroupBy((s, p) => s.DicDataName)
               .GroupBy((s, p) => p.Hour)
               .OrderBy((s, p) => s.DicDataValue)
@@ -560,6 +562,9 @@ namespace Hotline.Repository.SqlSugar.Orders
             //增加小计
             DataColumn totalColumn = new DataColumn("小计", typeof(decimal));
             dt.Columns.Add(totalColumn);
+            if (dt.Columns.Contains("Column1"))
+                dt.Columns.Remove("Column1");
+
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 int sumcount = 0;

src/Hotline/Orders/OrderProvinceZmhd.cs

@@ -12,6 +12,34 @@ namespace Hotline.Orders
     /// </summary>
     public  class OrderProvinceZmhd: CreationEntity
     {
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string No { get; set; }
 
+        /// <summary>
+        /// 省工单编号
+        /// </summary>
+        public string ProvinceNo {  get; set; }
+
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string OrderId { get; set; }
+
+        /// <summary>
+        /// 部门答复时间
+        /// </summary>
+        public DateTime? AnswerTime {  get; set; }
+
+        /// <summary>
+        /// 答复部门名称
+        /// </summary>
+        public string AnswerOu {  get; set; }
+
+        /// <summary>
+        /// 答复内容
+        /// </summary>
+        public string AnswerContent { get; set; }
     }
 }