司法修改Bug

src/Hotline.Api/Controllers/Bigscreen/JudicialManagementScreenController.cs

@@ -47,7 +47,7 @@ namespace Hotline.Api.Controllers.Bigscreen
             var dto = new OrderModuleDto();
 
             var data = await _judicialManagementOrdersRepository.Queryable()
-                .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime)
+                .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.IsItCounted == true)
                 .Select(o => new
                 {
                     o.Id,
@@ -102,7 +102,7 @@ namespace Hotline.Api.Controllers.Bigscreen
 
             var list = await _judicialManagementOrdersRepository.Queryable()
                .LeftJoin<JudicialComplaintsEventType>((o, j) => o.EventTypeOneLevelId == j.Id)
-               .Where((o, j) => o.EventTypeOneLevelId != null && j.Id != null)
+               .Where((o, j) => o.EventTypeOneLevelId != null && j.Id != null&&o.IsItCounted==true)
                .Where((o, j) => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.AreaCode.StartsWith(AreaCode))
                .Select((o, j) => new
                {
@@ -169,7 +169,7 @@ namespace Hotline.Api.Controllers.Bigscreen
                 };
 
                 var data = await _judicialManagementOrdersRepository.Queryable()
-                .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.AreaCode.StartsWith(item.Id))
+                .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.AreaCode.StartsWith(item.Id)&&o.IsItCounted==true)
                 .Select(o => new
                 {
                     o.Id,
@@ -213,7 +213,7 @@ namespace Hotline.Api.Controllers.Bigscreen
         {
             var list = await _judicialManagementOrdersRepository.Queryable()
                   .LeftJoin<SystemArea>((o, s) => o.AreaCode == s.Id)
-                  .Where((o, s) => o.CreationTime.Date >= DateTime.Now.Date)
+                  .Where((o, s) => o.CreationTime.Date >= DateTime.Now.Date&&o.IsItCounted==true)
                   .Select((o, s) => new
                   {
                       o.Id,
@@ -251,7 +251,7 @@ namespace Hotline.Api.Controllers.Bigscreen
                  .LeftJoin<OrderVisit>((x, o) => x.Id == o.OrderId)
                  .LeftJoin<OrderVisitDetail>((x, o, p) => o.Id == p.VisitId)
                 .Where((x, o, p) => o.VisitTime >= StartTime && o.VisitTime <= EndTime && p.VisitTarget == EVisitTarget.Org &&
-                o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode) && p.VisitOrgCode.Length >= 6)
+                o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode) && p.VisitOrgCode.Length >= 6&&x.IsItCounted==true)
                 .Select((x, o, p) => new
                 {
                     p.VisitOrgCode,
@@ -296,7 +296,7 @@ namespace Hotline.Api.Controllers.Bigscreen
             }
 
             var queryData = await _judicialManagementOrdersRepository.Queryable()
-                       .Where(o => o.CreationTime >= StartDate && o.CreationTime <= EndDate)
+                       .Where(o => o.CreationTime >= StartDate && o.CreationTime <= EndDate&&o.IsItCounted==true)
                        .Select(o => new
                        {
                            o.Id,
@@ -338,13 +338,13 @@ namespace Hotline.Api.Controllers.Bigscreen
             EndTime = EndTime.AddDays(1).AddSeconds(-1);
 
             var SumCount = await _judicialManagementOrdersRepository.Queryable()
-               .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime)
+               .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.IsItCounted == true)
                .CountAsync();
 
             if (IsSource)
             {
                 var list = await _judicialManagementOrdersRepository.Queryable()
-                .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime)
+                .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime&&o.IsItCounted==true)
                 .GroupBy(o => new { o.SourceChannelCode, o.SourceChannel })
                 .Select(o => new OrderProportionStatisticsDto()
                 {
@@ -358,7 +358,7 @@ namespace Hotline.Api.Controllers.Bigscreen
             else
             {
                 var list = await _judicialManagementOrdersRepository.Queryable()
-               .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime)
+               .Where(o => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.IsItCounted == true)
                 .GroupBy(o => new { o.AcceptTypeCode, o.AcceptType })
                 .Select(o => new OrderProportionStatisticsDto()
                 {

src/Hotline.Api/Controllers/JudicialManagementOrdersController.cs

@@ -484,7 +484,7 @@ namespace Hotline.Api.Controllers
              var items = await _judicialComplaintsEventTypeRepository.Queryable()
              .LeftJoin<JudicialManagementOrders>((x, o) => o.EventTypeSpliceName != null &&
              (x.EventTypeName == o.EventTypeSpliceName || o.EventTypeSpliceName.Contains(x.EventTypeName)))
-            .Where((x, o) => o.CreationTime >= StartTime && o.CreationTime <= EndTime)
+            .Where((x, o) => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.IsItCounted == true)
             .WhereIF(!string.IsNullOrEmpty(areCodeText), (x, o) => o.AreaCode.StartsWith(areCodeText))
              .Where((x, o) => x.ParentId == Id)
              .GroupBy((x, o) => new { x.Id, x.EventTypeName })

src/Hotline.Application/JudicialManagement/EnforcementApplication.cs

@@ -264,6 +264,7 @@ namespace Hotline.Application.JudicialManagement
             var areaCode = _sessionContext.OrgAreaCode ?? "511500";
 
             return _judicialManagementOrdersRepository.Queryable()
+                .Where(d => d.IsItCounted == true)
                     .WhereIF(areaCode != "511500", d => d.AreaCode.StartsWith(areaCode))
                     .WhereIF(dto.IsEnforcementOrder.HasValue, d => d.IsEnforcementOrder == dto.IsEnforcementOrder)//是否行政执法类
                     .WhereIF(dto.IsPassTheBuckOrder.HasValue, d => d.IsPassTheBuckOrder == dto.IsPassTheBuckOrder)//是否推诿
@@ -302,7 +303,7 @@ namespace Hotline.Application.JudicialManagement
                 areCodeText = dto.AreaCode;
 
             return _judicialManagementOrdersRepository.Queryable()
-            .Where(d => d.CreationTime >= dto.StartTime && d.CreationTime <= dto.EndTime && d.EventTypeId != null)
+            .Where(d =>d.IsItCounted==true&& d.CreationTime >= dto.StartTime && d.CreationTime <= dto.EndTime && d.EventTypeId != null)
             .WhereIF(!string.IsNullOrEmpty(dto.EventTypeId), d => d.EventTypeId.StartsWith(dto.EventTypeId))
             .WhereIF(!string.IsNullOrEmpty(areCodeText), d => d.AreaCode.StartsWith(areCodeText))
             .OrderByDescending(d => d.CreationTime)
@@ -319,7 +320,7 @@ namespace Hotline.Application.JudicialManagement
         {
             return _enforcementOrdersHandlerRepository.Queryable()
                    .LeftJoin<JudicialManagementOrders>((h, o) => h.OrderId == o.Id)
-                   .Where((h, o) => o.CreationTime >= StartTime && o.CreationTime <= EndTime)
+                   .Where((h, o) => o.CreationTime >= StartTime && o.CreationTime <= EndTime&&o.IsItCounted==true)
                     .GroupBy((h, o) => new
                     {
                         OrgCode = h.OrgCode,
@@ -346,7 +347,7 @@ namespace Hotline.Application.JudicialManagement
         {
             return _enforcementOrdersHandlerRepository.Queryable()
                  .LeftJoin<JudicialManagementOrders>((x, o) => x.OrderId == o.Id)
-                 .Where((x, o) => o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime && o.Id != null)
+                 .Where((x, o) => o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime && o.Id != null&&o.IsItCounted==true)
                  .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode == "001", (x, o) => x.OrgCode == dto.OrgCode)
                  .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode != "001", (x, o) => x.OrgCode.StartsWith(dto.OrgCode))
                  .WhereIF(dto.TheClueIsTrue == true, (x, o) => o.IsTheClueTrue == true)
@@ -397,7 +398,7 @@ namespace Hotline.Application.JudicialManagement
         {
             var areaCode = _sessionContext.OrgAreaCode ?? "511500";
             return _judicialManagementOrdersRepository.Queryable()
-                .Where(x => x.CreationTime >= StartTime && x.CreationTime <= EndTime)
+                .Where(x => x.CreationTime >= StartTime && x.CreationTime <= EndTime&&x.IsItCounted==true)
                 .LeftJoin<SystemArea>((x, o) => x.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) == o.Id)
                 .WhereIF(areaCode != "511500", (x, o) => x.AreaCode.StartsWith(areaCode))
                 .GroupBy((x, o) => new
@@ -427,7 +428,7 @@ namespace Hotline.Application.JudicialManagement
         public ISugarQueryable<JudicialManagementOrders> GetRegionalClassificationStatisticsOrderListAsync(QueryRegionalClassificationStatisticsDto dto)
         {
             return _judicialManagementOrdersRepository.Queryable()
-            .Where(d => d.CreationTime >= dto.StartTime && d.CreationTime <= dto.EndTime)
+            .Where(d => d.CreationTime >= dto.StartTime && d.CreationTime <= dto.EndTime && d.IsItCounted == true)
             .WhereIF(!string.IsNullOrEmpty(dto.AreaCode), d => d.AreaCode.StartsWith(dto.AreaCode))
             .WhereIF(dto.TheClueIsTrue == true, d => d.IsTheClueTrue == true)
             .WhereIF(dto.TheClueIsNotTrue == true, d => d.IsTheClueTrue == false)
@@ -451,7 +452,7 @@ namespace Hotline.Application.JudicialManagement
             return _judicialManagementOrdersRepository.Queryable()
                  .LeftJoin<OrderVisit>((x, o) => x.Id == o.OrderId)
                  .LeftJoin<OrderVisitDetail>((x, o, p) => o.Id == p.VisitId)
-                .Where((x, o, p) => o.VisitTime >= StartTime && o.VisitTime <= EndTime && p.VisitTarget == EVisitTarget.Org
+                .Where((x, o, p) => o.VisitTime >= StartTime && o.VisitTime <= EndTime&&x.IsItCounted==true && p.VisitTarget == EVisitTarget.Org
                 && o.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(p.VisitOrgCode) && x.OrderSoure == EOrderSoure.Hotline)
                 .GroupBy((x, o, p) => new
                 {
@@ -499,7 +500,7 @@ namespace Hotline.Application.JudicialManagement
             return _judicialManagementOrdersRepository.Queryable()
                 .LeftJoin<OrderVisit>((x, o) => x.Id == o.OrderId)
                 .LeftJoin<OrderVisitDetail>((x, o, p) => o.Id == p.VisitId)
-                .Where((x, o, p) => o.VisitTime >= dto.StartTime && o.VisitTime <= dto.EndTime && p.VisitTarget == EVisitTarget.Org && x.OrderSoure == EOrderSoure.Hotline)
+                .Where((x, o, p) => o.VisitTime >= dto.StartTime && o.VisitTime <= dto.EndTime&&x.IsItCounted==true && p.VisitTarget == EVisitTarget.Org && x.OrderSoure == EOrderSoure.Hotline)
                 .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/JudicialManagementAddOrderDto.cs

@@ -182,5 +182,10 @@ namespace Hotline.Share.Dtos.JudicialManagement
         /// </summary>
         public List<FileDto>? Additions { get; set; } = new();
         public List<FileJson>? FileJson { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreationTime { get; set; }
     }
 }