解决冲突

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -2961,208 +2961,6 @@ namespace Hotline.Api.Controllers.Bi
             var stream = ExcelHelper.CreateStream(dataTable);
             return ExcelStreamResult(stream, "受理类型分时统计数据");
         }
-
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("order_temp_st")]
-        public async Task OrderTempSt()
-        {
-            DateTime StartTime = DateTime.Parse("2024-06-01");
-            DateTime EndTime = DateTime.Parse("2024-07-01");
-            _orderRepository.Queryable()
-                .Where(x => x.CreationTime >= StartTime && x.CreationTime <= EndTime)
-                //.Select()
-                ;
-        }
-
-        public class QueryTempDto
-        {
-            /// <summary>
-            /// 信件状态
-            /// </summary>
-            public EOrderStatus Status { get; set; }
-
-            /// <summary>
-            /// 是否超期
-            /// </summary>
-            public string IsOverTime { get; set; }
-
-            /// <summary>
-            /// 来源
-            /// </summary>
-            public string Source { get; set; }
-
-            /// <summary>
-            /// 转接来源
-            /// </summary>
-            public string TransferPhone { get; set; }
-
-            /// <summary>
-            /// 当前节点
-            /// </summary>
-            public string ActualHandleStepName { get; set; }
-
-            /// <summary>
-            /// 重办次数
-            /// </summary>
-            public int? ReTransactNum { get; set; }
-
-            /// <summary>
-            /// 甄别状态
-            /// </summary>
-            public string? OrderScreenStatus { get; set; }
-
-            /// <summary>
-            /// 受理编号
-            /// </summary>
-            public string? No { get; set; }
-
-            /// <summary>
-            /// 省编号
-            /// </summary>
-            public string? ProvinceNo { get; set; }
-
-            /// <summary>
-            /// 受理时间
-            /// </summary>
-            public string? StartTime { get; set; }
-
-            /// <summary>
-            /// 标题
-            /// </summary>
-            public string Title { get; set; }
-
-            /// <summary>
-            /// 超期时间（期满时间）
-            /// </summary>
-            public string? ExpiredTime { get; set; }
-
-            /// <summary>
-            /// 一级部门
-            /// </summary>
-            public string? OrgLevelOneName { get; set; }
-
-            /// <summary>
-            /// 二级部门
-            /// </summary>
-            public string? OrgLevelTwoName { get; set; }
-
-            /// <summary>
-            /// 受理人部门名称
-            /// </summary>
-            public string? AcceptorOrgName { get; set; }
-
-            /// <summary>
-            /// 归档时间（暂为流程结束时间，因流程结束自动归档）
-            /// </summary>
-            public DateTime? FiledTime { get; set; }
-
-            /// <summary>
-            /// 受理类型
-            /// </summary>
-            public string? AcceptType { get; set; }
-
-            /// <summary>
-            /// 热点类型
-            /// </summary>
-            public string? HotspotName { get; set; }
-
-            /// <summary>
-            /// 热点全称
-            /// </summary>
-            public string? HotspotSpliceName { get; set; }
-
-            /// <summary>
-            /// 区域
-            /// </summary>
-            public string? AreaName { get; set; }
-
-            /// <summary>
-            /// 区域全称
-            /// </summary>
-            public string? FullAddress { get; set; }
-
-            /// <summary>
-            /// 受理人名称
-            /// </summary>
-            public string? AcceptorName { get; set; }
-
-            /// <summary>
-            /// 来电/信人姓名
-            /// </summary>
-            public string? FromName { get; set; }
-
-            /// <summary>
-            /// 联系电话
-            /// </summary>
-            public string? Contact { get; set; }
-
-            /// <summary>
-            /// 来电号码
-            /// </summary>
-            public string? FromPhone { get; set; }
-
-            /// <summary>
-            /// 事发地址
-            /// </summary>
-            public string? Address { get; set; }
-
-            /// <summary>
-            /// 具体对象
-            /// </summary>
-            public string? Obj { get; set; }
-
-            /// <summary>
-            /// 来电/信人身份
-            /// </summary>
-            public EIdentityType? IdentityType { get; set; }
-
-            /// <summary>
-            /// 来电/信人性别
-            /// </summary>
-            public EGender FromGender { get; set; }
-
-            /// <summary>
-            /// 坐席满意度
-            /// </summary>
-            public string? SeatVisitResult { get; set; }
-
-            /// <summary>
-            /// 第一次评价结果
-            /// </summary>
-            public string? FirstVisitResult { get; set; }
-
-            /// <summary>
-            /// 推送分类
-            /// </summary>
-            public string? PushType { get; set; }
-
-            /// <summary>
-            /// 诉求内容
-            /// </summary>
-            public string Content { get; set; }
-
-            /// <summary>
-            /// 实际办理意见
-            /// </summary>
-            public string ActualOpinion { get; set; }
-
-            /// <summary>
-            /// 归档意见
-            /// </summary>
-            public string? FileOpinion { get; set; }
-
-            /// <summary>
-            /// 创建时间
-            /// </summary>
-            public DateTime CreationTime { get; set; }
-
-
-        }
     }
 
 }