统一司法报表时间参数

src/Hotline.Api/Controllers/EnforcementOrderController.cs

@@ -263,21 +263,21 @@ namespace Hotline.Api.Controllers
         /// <summary>
         /// 事项分类统计
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
         /// <param name="Id"></param>
         /// <param name="AreaCode"></param>
         /// <returns></returns>
         [HttpGet("event_classification_statistics")]
-        public async Task<object> GetEventClassificationStatisticsAsync(DateTime StartDate, DateTime EndDate, string Id, string AreaCode)
+        public async Task<object> GetEventClassificationStatisticsAsync(DateTime StartTime, DateTime EndTime, string Id, string AreaCode)
         {
 
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            EndTime = EndTime.AddDays(1).AddSeconds(-1);
 
             var items = await _judicialComplaintsEventTypeRepository.Queryable()
              .LeftJoin<EnforcementOrders>((x, o) => o.EventTypeSpliceName != null && (x.EventTypeName == o.EventTypeSpliceName || o.EventTypeSpliceName.Contains(x.EventTypeName)))
             .LeftJoin<Order>((x, o, p) => p.Id == o.Id)
-            .Where((x, o, p) => p.StartTime >= StartDate && p.StartTime <= EndDate)
+            .Where((x, o, p) => p.StartTime >= StartTime && p.StartTime <= EndTime)
             .WhereIF(!string.IsNullOrEmpty(AreaCode), (x, o, p) => p.AreaCode.StartsWith(AreaCode))
              .Where((x, o, p) => x.ParentId == Id)
              .GroupBy((x, o, p) => new { x.Id, x.EventTypeName })
@@ -294,7 +294,7 @@ namespace Hotline.Api.Controllers
             var data = await _enforcementOrdersRepository.Queryable()
                 .Includes(x => x.Order)
                 .Where(d => d.Order.Id != null)
-                .Where(d => d.Order.StartTime >= StartDate && d.Order.StartTime <= EndDate)
+                .Where(d => d.Order.StartTime >= StartTime && d.Order.StartTime <= EndTime)
                 .GroupBy(d => d.Id)
                  .Select(d => new EventClassificationOrderCountDto
                  {
@@ -324,12 +324,12 @@ namespace Hotline.Api.Controllers
         [HttpGet("event_classification_statistics_order_list")]
         public async Task<PagedDto<EnforcementOrderListDto>> GetEventClassificationStatisticsOrderListAsync([FromQuery] QueryEventClassificationStatisticsDto dto)
         {
-            dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
+            dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
 
             var (total, items) = await _enforcementOrdersRepository.Queryable()
             .Includes(x => x.Order)
             .Where(d => d.Order.Id != null)
-            .Where(d => d.Order.StartTime >= dto.StartDate && d.Order.StartTime <= dto.EndDate && d.EventTypeId != null)
+            .Where(d => d.Order.StartTime >= dto.StartTime && d.Order.StartTime <= dto.EndTime && d.EventTypeId != null)
             .WhereIF(!string.IsNullOrEmpty(dto.EventTypeId), d => d.EventTypeId.StartsWith(dto.EventTypeId))
             .WhereIF(!string.IsNullOrEmpty(dto.AreaCode), d => d.Order.AreaCode.StartsWith(dto.AreaCode))
               .OrderByDescending(d => d.CreationTime)
@@ -341,18 +341,18 @@ namespace Hotline.Api.Controllers
         /// <summary>
         /// 执法部门办件统计
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
         /// <returns></returns>
         [HttpGet("enforcement_departmental_processing_statistics")]
-        public async Task<object> GetDepartmentalProcessingStatisticsAsync(DateTime StartDate, DateTime EndDate)
+        public async Task<object> GetDepartmentalProcessingStatisticsAsync(DateTime StartTime, DateTime EndTime)
         {
 
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            EndTime = EndTime.AddDays(1).AddSeconds(-1);
             var data = await _enforcementOrdersRepository.Queryable()
                    .Includes(x => x.Order)
                    .Where(d => d.Order.Id != null)
-                   .Where(d => d.Order.StartTime >= StartDate && d.Order.StartTime <= EndDate)
+                   .Where(d => d.Order.StartTime >= StartTime && d.Order.StartTime <= EndTime)
                     .GroupBy(d => new
                     {
                         OrgCode = d.Order.OrgLevelOneCode,
@@ -375,22 +375,22 @@ namespace Hotline.Api.Controllers
         /// <summary>
         /// 执法部门办件统计---子级
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
         /// <param name="OrgCode"></param>
         /// <returns></returns>
         [HttpGet("enforcement_departmental_processing_statistics_child")]
-        public async Task<object> GetDepartmentalProcessingStatisticsChildAsync(DateTime StartDate, DateTime EndDate, string OrgCode)
+        public async Task<object> GetDepartmentalProcessingStatisticsChildAsync(DateTime StartTime, DateTime EndTime, string OrgCode)
         {
 
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            EndTime = EndTime.AddDays(1).AddSeconds(-1);
             if (string.IsNullOrEmpty(OrgCode))
                 throw UserFriendlyException.SameMessage("部门code不能为空!");
 
             var data = await _enforcementOrdersRepository.Queryable()
                    .Includes(x => x.Order)
                    .Where(d => d.Order.Id != null)
-                   .Where(d => d.Order.StartTime >= StartDate && d.Order.StartTime <= EndDate)
+                   .Where(d => d.Order.StartTime >= StartTime && d.Order.StartTime <= EndTime)
                    .WhereIF(OrgCode == "001", d => d.Order.ActualHandleOrgCode == OrgCode)
                    .WhereIF(OrgCode != "001", d => d.Order.ActualHandleOrgCode.StartsWith(OrgCode))
                     .GroupBy(d => new
@@ -421,12 +421,12 @@ namespace Hotline.Api.Controllers
         [HttpGet("enforcement_departmental_processing_statistics_order_list")]
         public async Task<PagedDto<EnforcementOrderListDto>> GetDepartmentalProcessingStatisticsOrderListAsync([FromQuery] QueryDepartmentalProcessingStatisticsDto dto)
         {
-            dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
+            dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
 
             var (total, items) = await _enforcementOrdersRepository.Queryable()
             .Includes(x => x.Order)
             .Where(d => d.Order.Id != null)
-            .Where(d => d.Order.StartTime >= dto.StartDate && d.Order.StartTime <= dto.EndDate)
+            .Where(d => d.Order.StartTime >= dto.StartTime && d.Order.StartTime <= dto.EndTime)
             .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode == "001", d => d.Order.ActualHandleOrgCode == dto.OrgCode)
             .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode != "001", d => d.Order.ActualHandleOrgCode.StartsWith(dto.OrgCode))
             .WhereIF(dto.TheClueIsTrue == true, d => d.IsTheClueTrue == true)
@@ -443,14 +443,14 @@ namespace Hotline.Api.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("regional_classification_statistics")]
-        public async Task<object> GetRegionalClassificationStatisticsAsync(DateTime StartDate, DateTime EndDate)
+        public async Task<object> GetRegionalClassificationStatisticsAsync(DateTime StartTime, DateTime EndTime)
         {
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            EndTime = EndTime.AddDays(1).AddSeconds(-1);
             var areaCode = _sessionContext.OrgAreaCode ?? "511500";
             var list = await _enforcementOrdersRepository.Queryable()
                .Includes(x => x.Order)
                .Where(x => x.Order.Id != null)
-               .Where(x => x.Order.StartTime >= StartDate && x.Order.StartTime <= EndDate)
+               .Where(x => x.Order.StartTime >= StartTime && x.Order.StartTime <= EndTime)
                .LeftJoin<SystemArea>((x, o) => x.Order.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) == o.Id)
                .Where((x, o) => x.Order.Status >= EOrderStatus.Filed)
                .WhereIF(areaCode != "511500", (x, o) => x.Order.AreaCode.StartsWith(areaCode))
@@ -482,12 +482,12 @@ namespace Hotline.Api.Controllers
         [HttpGet("regional_classification_statistics_order_list")]
         public async Task<PagedDto<EnforcementOrderListDto>> GetRegionalClassificationStatisticsOrderListAsync([FromQuery] QueryRegionalClassificationStatisticsDto dto)
         {
-            dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
+            dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
 
             var (total, items) = await _enforcementOrdersRepository.Queryable()
             .Includes(x => x.Order)
             .Where(d => d.Order.Id != null)
-            .Where(d => d.Order.StartTime >= dto.StartDate && d.Order.StartTime <= dto.EndDate)
+            .Where(d => d.Order.StartTime >= dto.StartTime && d.Order.StartTime <= dto.EndTime)
             .WhereIF(!string.IsNullOrEmpty(dto.AreaCode), d => d.Order.AreaCode.StartsWith(dto.AreaCode))
             .WhereIF(dto.TheClueIsTrue == true, d => d.IsTheClueTrue == true)
             .WhereIF(dto.TheClueIsNotTrue == true, d => d.IsTheClueTrue == false)
@@ -501,19 +501,19 @@ namespace Hotline.Api.Controllers
         /// <summary>
         /// 部门满意度统计
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
         /// <param name="TypeId">1:办件结果 2:办件态度</param>
         /// <returns></returns>
         [HttpGet("enforcement_visit_org_satisfaction_statistics")]
-        public async Task<object> GetVisitAndOrgSatisfactionStatisticsAsync(DateTime StartDate, DateTime EndDate, int TypeId)
+        public async Task<object> GetVisitAndOrgSatisfactionStatisticsAsync(DateTime StartTime, DateTime EndTime, int TypeId)
         {
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            EndTime = EndTime.AddDays(1).AddSeconds(-1);
 
             var list = await _enforcementOrdersRepository.Queryable()
                  .LeftJoin<OrderVisit>((x, o) => x.Id == o.OrderId)
                  .LeftJoin<OrderVisitDetail>((x, o, p) => o.Id == p.VisitId)
-                .Where((x, o, p) => o.VisitTime >= StartDate && o.VisitTime <= EndDate && p.VisitTarget == EVisitTarget.Org && o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode))
+                .Where((x, o, p) => o.VisitTime >= StartTime && o.VisitTime <= EndTime && p.VisitTarget == EVisitTarget.Org && o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode))
                 .GroupBy((x, o, p) => new
                 {
                     VisitOrgCode = p.VisitOrgCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6"))
@@ -569,20 +569,20 @@ namespace Hotline.Api.Controllers
         /// <summary>
         /// 部门满意度统计----子级
         /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
         /// <param name="TypeId">1:办件结果 2:办件态度</param>
         /// <param name="OrgCode"></param>
         /// <returns></returns>
         [HttpGet("enforcement_visit_org_satisfaction_statistics_child")]
-        public async Task<object> GetVisitAndOrgSatisfactionStatisticsChildAsync(DateTime StartDate, DateTime EndDate, int TypeId, string OrgCode)
+        public async Task<object> GetVisitAndOrgSatisfactionStatisticsChildAsync(DateTime StartTime, DateTime EndTime, int TypeId, string OrgCode)
         {
-            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            EndTime = EndTime.AddDays(1).AddSeconds(-1);
 
             var list = await _enforcementOrdersRepository.Queryable()
                  .LeftJoin<OrderVisit>((x, o) => x.Id == o.OrderId)
                  .LeftJoin<OrderVisitDetail>((x, o, p) => o.Id == p.VisitId)
-                 .Where((x, o, p) => o.VisitTime >= StartDate && o.VisitTime <= EndDate && p.VisitTarget == EVisitTarget.Org)
+                 .Where((x, o, p) => o.VisitTime >= StartTime && o.VisitTime <= EndDate && p.VisitTarget == EVisitTarget.Org)
                  .Where((x, o, p) => o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode))
                  .WhereIF(!string.IsNullOrEmpty(OrgCode) && OrgCode == "001", (x, o, p) => p.VisitOrgCode == OrgCode)
                  .WhereIF(!string.IsNullOrEmpty(OrgCode) && OrgCode != "001", (x, o, p) => p.VisitOrgCode.StartsWith(OrgCode))
@@ -646,14 +646,14 @@ namespace Hotline.Api.Controllers
         [HttpGet("enforcement_visit_org_satisfaction_statistics_order_list")]
         public async Task<PagedDto<EnforcementOrgSatisfactionOrderListDto>> GetVisitAndOrgSatisfactionStatisticsOrderListAsync([FromQuery] QueryOrgSatisfactionStatisticsDto dto)
         {
-            dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
+            dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
 
             var (total, items) = await _enforcementOrdersRepository.Queryable()
                 .Includes(x => x.Order)
                 .Where(x => x.Order.Id != null)
                 .LeftJoin<OrderVisit>((x, o) => x.Id == o.OrderId)
                 .LeftJoin<OrderVisitDetail>((x, o, p) => o.Id == p.VisitId)
-                .Where((x, o, p) => o.VisitTime >= dto.StartDate && o.VisitTime <= dto.EndDate && p.VisitTarget == EVisitTarget.Org)
+                .Where((x, o, p) => o.VisitTime >= dto.StartTime && o.VisitTime <= dto.EndTime && p.VisitTarget == EVisitTarget.Org)
                 .Where((x, o, p) => o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode))
                 .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode == "001", (x, o, p) => p.VisitOrgCode == dto.OrgCode)
                 .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode != "001", (x, o, p) => p.VisitOrgCode.StartsWith(dto.OrgCode))

src/Hotline.Share/Dtos/JudicialManagement/QueryEventClassificationStatisticsDto.cs

@@ -4,8 +4,8 @@ namespace Hotline.Share.Dtos.JudicialManagement
 {
     public record QueryEventClassificationStatisticsDto : PagedRequest
     {
-        public DateTime StartDate { get; set; }
-        public DateTime EndDate { get; set; }
+        public DateTime StartTime { get; set; }
+        public DateTime EndTime { get; set; }
         public string EventTypeId { get; set; }
 
         public string AreaCode { get; set; }
@@ -13,8 +13,8 @@ namespace Hotline.Share.Dtos.JudicialManagement
 
     public record QueryDepartmentalProcessingStatisticsDto: PagedRequest
     {
-        public DateTime StartDate { get; set; }
-        public DateTime EndDate { get; set; }
+        public DateTime StartTime { get; set; }
+        public DateTime EndTime { get; set; }
 
         /// <summary>
         /// 部门code
@@ -42,8 +42,8 @@ namespace Hotline.Share.Dtos.JudicialManagement
     /// </summary>
     public record QueryRegionalClassificationStatisticsDto : PagedRequest
     {
-        public DateTime StartDate { get; set; }
-        public DateTime EndDate { get; set; }
+        public DateTime StartTime { get; set; }
+        public DateTime EndTime { get; set; }
 
         /// <summary>
         /// 区域code
@@ -71,8 +71,8 @@ namespace Hotline.Share.Dtos.JudicialManagement
     /// </summary>
     public record QueryOrgSatisfactionStatisticsDto : PagedRequest
     {
-        public DateTime StartDate { get; set; }
-        public DateTime EndDate { get; set; }
+        public DateTime StartTime { get; set; }
+        public DateTime EndTime { get; set; }
 
         /// <summary>
         /// 部门code