Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

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

@@ -1484,7 +1484,7 @@ namespace Hotline.Api.Controllers.Bi
 
             dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
 
-            var (total, items) = await _orderRepository.Queryable(false, false, false)
+            var (total, items) = await _orderRepository.Queryable()
                 .Where(x => x.CreationTime >= dto.StartDate && x.CreationTime <= dto.EndDate)
                 .LeftJoin<SystemArea>((it, o) => it.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) == o.Id)
                 .WhereIF(dto.AreaCodes.Any(), (it, o) => dto.AreaCodes.Contains(it.AreaCode)) //区域
@@ -1539,7 +1539,8 @@ namespace Hotline.Api.Controllers.Bi
         [HttpGet("highmatter-warning-detail")]
         public async Task<PagedDto<OrderDto>> HighMatterWarningDetail([FromQuery] HighMatterWarningDetailRequest dto)
         {
-            var (total, items) = await _orderRepository.Queryable(viewFilter: true)
+            dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
+            var (total, items) = await _orderRepository.Queryable()
             .Includes(x => x.OrderScreens)
             .Where(d => d.AcceptTypeCode == dto.AcceptTypeCode) //受理类型
             .Where(d => d.HotspotId == dto.HotspotId) //热点类型

src/Hotline.Api/Controllers/EnforcementOrderController.cs

@@ -11,6 +11,7 @@ using Hotline.Share.Dtos.JudicialManagement;
 using Hotline.Share.Enums.Order;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
 using System.Diagnostics.Eventing.Reader;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
@@ -176,6 +177,11 @@ namespace Hotline.Api.Controllers
                 else
                     order.EventTypeName = null;
 
+                if (!string.IsNullOrEmpty(dto.EventTypeSpliceName))
+                    order.EventTypeSpliceName = dto.EventTypeSpliceName;
+                else
+                    order.EventTypeSpliceName = null;
+
                 if (!string.IsNullOrEmpty(dto.EventTypeId))
                 {
                     order.EventTypeOneLevelId = dto.EventTypeId.Substring(0, 2);
@@ -184,7 +190,7 @@ namespace Hotline.Api.Controllers
                 else
                 {
                     order.EventTypeOneLevelId = null;
-                    order.EventTypeOneLevelId = null;
+                    order.EventTypeId = null;
                 }
                 await _enforcementOrdersRepository.UpdateAsync(order, HttpContext.RequestAborted);
             }
@@ -200,21 +206,37 @@ namespace Hotline.Api.Controllers
             return await _judicialComplaintsEventTypeRepository.Queryable().ToTreeAsync(it => it.Children, it => it.ParentId, null, it => it.Id);
         }
 
-        ///// <summary>
-        ///// 
-        ///// </summary>
-        ///// <param name="StartDate"></param>
-        ///// <param name="EndDate"></param>
-        ///// <returns></returns>
-        //[HttpGet("departmental_processing_statistics")]
-        //public async Task<object> GetDepartmentalProcessingStatisticsAsync(DateTime StartDate, DateTime EndDate)
-        //{
-
-        //    EndDate = EndDate.AddDays(1).AddSeconds(-1);
-        //    await _enforcementOrdersRepository.Queryable()
-        //        .LeftJoin<Order>
-
+        /// <summary>
+        /// 执法部门办件统计
+        /// </summary>
+        /// <param name="StartDate"></param>
+        /// <param name="EndDate"></param>
+        /// <returns></returns>
+        [HttpGet("enforcement_departmental_processing_statistics")]
+        public async Task<object> GetDepartmentalProcessingStatisticsAsync(DateTime StartDate, DateTime EndDate)
+        {
 
-        //}
+            EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            var data = await _enforcementOrdersRepository.Queryable()
+                   .Includes(x => x.Order)
+                   .Where(d => d.Order.Id != null)
+                   .Where(d => d.Order.FiledTime >= StartDate && d.Order.FiledTime <= EndDate)
+                    .GroupBy(d => new
+                    {
+                        OrgCode = d.Order.OrgLevelOneCode,
+                        OrgName = d.Order.OrgLevelOneName
+                    })
+                    .Select(d => new
+                    {
+                        OrgName = d.Order.OrgLevelOneName,
+                        CountNum = SqlFunc.AggregateCount(d.Order.OrgLevelOneCode),
+                        TheClueIsTrue = SqlFunc.AggregateSum(SqlFunc.IIF(d.IsTheClueTrue.HasValue && d.IsTheClueTrue.Value==true, 1, 0)),
+                        TheClueIsNotTrue = SqlFunc.AggregateSum(SqlFunc.IIF(d.IsTheClueTrue.HasValue && d.IsTheClueTrue.Value == false, 1, 0)),
+                        EnforcementOrder = SqlFunc.AggregateSum(SqlFunc.IIF(d.IsEnforcementOrder, 1, 0))
+                    })
+                   .ToListAsync();
+
+            return data;
+        }
     }
 }

src/Hotline.Application/JudicialManagement/EnforcementApplication.cs

@@ -107,7 +107,7 @@ namespace Hotline.Application.JudicialManagement
         public async Task AddPassTheBuckOrderAsync(Hotline.Orders.Order order, string orgCode, string orgName, CancellationToken cancellationToken)
         {
             //排除咨询件
-            if (order.AcceptTypeCode == "30")
+            if (order.AcceptTypeCode == "10")
                 return;
 
             //如果没开启则不处理

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -71,6 +71,8 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.IsTheClueTrue, x => x.IsTheClueTrue)
                 .Map(d => d.EventTypeName, x => x.EventTypeName)
                 .Map(d => d.EventTypeId, x => x.EventTypeId)
+                .Map(d => d.EventTypeSpliceName, x => x.EventTypeSpliceName)
+                
                  ;
 
 

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

@@ -24,5 +24,10 @@
         /// 诉事项类型名称
         /// </summary>
         public string? EventTypeName { get; set; }
+
+        /// <summary>
+        /// 诉事项类型名称
+        /// </summary>
+        public string? EventTypeSpliceName { get; set; }
     }
 }

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

@@ -167,6 +167,11 @@ namespace Hotline.Share.Dtos.JudicialManagement
         /// </summary>
         public string? EventTypeName { get; set; }
 
+        /// <summary>
+        /// 诉事项类型名称
+        /// </summary>
+        public string? EventTypeSpliceName { get; set; }
+
         /// <summary>
         /// 是否显示修改按钮
         /// </summary>

src/Hotline/JudicialManagement/EnforcementOrders.cs

@@ -36,6 +36,11 @@ namespace Hotline.JudicialManagement
         /// </summary>
         public string? EventTypeName { get; set; }
 
+        /// <summary>
+        /// 诉事项类型名称
+        /// </summary>
+        public string? EventTypeSpliceName { get; set; }
+
         /// <summary>
         /// 诉事项类型一级Id
         /// </summary>