src/Hotline.Api/Controllers/EnforcementOrderController.cs

@@ -362,11 +362,11 @@ namespace Hotline.Api.Controllers
         /// <param name="OrgCode"></param>
         /// <returns></returns>
         [HttpGet("enforcement_departmental_processing_statistics_child")]
-        public async Task<object> GetDepartmentalProcessingStatisticsAsync(DateTime StartDate, DateTime EndDate,string OrgCode)
+        public async Task<object> GetDepartmentalProcessingStatisticsAsync(DateTime StartDate, DateTime EndDate, string OrgCode)
         {
 
             EndDate = EndDate.AddDays(1).AddSeconds(-1);
-            if(string.IsNullOrEmpty(OrgCode))
+            if (string.IsNullOrEmpty(OrgCode))
                 throw UserFriendlyException.SameMessage("部门code不能为空!");
 
             var data = await _enforcementOrdersRepository.Queryable()
@@ -387,7 +387,7 @@ namespace Hotline.Api.Controllers
                         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();
 
@@ -408,8 +408,9 @@ namespace Hotline.Api.Controllers
             .Includes(x => x.Order)
             .Where(d => d.Order.Id != null)
             .Where(d => d.Order.CreationTime >= dto.StartDate && d.Order.CreationTime <= dto.EndDate)
-            .WhereIF(!string.IsNullOrEmpty(dto.OrgCode), d => d.Order.OrgLevelOneCode == dto.OrgCode)
-            .WhereIF(dto.TheClueIsTrue==true, d => d.IsTheClueTrue == true)
+            .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode == "001", d => d.Order.OrgLevelOneCode == 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)
             .WhereIF(dto.TheClueIsNotTrue == true, d => d.IsTheClueTrue == false)
             .WhereIF(dto.EnforcementOrder == true, d => d.IsEnforcementOrder == true)
               .OrderByDescending(d => d.CreationTime)