Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

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

@@ -2071,10 +2071,10 @@ namespace Hotline.Api.Controllers.Bi
                 .Select((x, so) => new OrderCompletedDto
                 {
                     CompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed, 1, 0)),
-                    ExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime > x.ActualHandleTime, 1, 0)),//超期已办
-                    CityExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime > x.ActualHandleTime && so.OrgType == EOrgType.City, 1, 0)),//市级超期已办
-                    CountyExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime > x.ActualHandleTime && so.OrgType == EOrgType.County, 1, 0)),//区县超期已办
-                    CenterExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime > x.ActualHandleTime && so.IsCenter, 1, 0)),//中心超期已办
+                    ExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.ActualHandleTime, 1, 0)),//超期已办
+                    CityExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.ActualHandleTime && so.OrgType == EOrgType.City, 1, 0)),//市级超期已办
+                    CountyExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.ActualHandleTime && so.OrgType == EOrgType.County, 1, 0)),//区县超期已办
+                    CenterExpiredTimeCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.ActualHandleTime && so.IsCenter, 1, 0)),//中心超期已办
                     CityCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && so.OrgType == EOrgType.City, 1, 0)),
                     CountyCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && so.OrgType == EOrgType.County, 1, 0)),
                     CenterCompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && so.IsCenter, 1, 0)),
@@ -2154,7 +2154,8 @@ namespace Hotline.Api.Controllers.Bi
             {
                 new CenterReportOrderSourceChannelDto
                 {
-                    Name = "来源总量",
+					AllCountNum = sourceChannelCount,
+					Name = "来源总量",
                     Code = "All",
                     CountNum = sourceChannelCount
                 }
@@ -2526,10 +2527,25 @@ namespace Hotline.Api.Controllers.Bi
             {
                 OrgStatistics = listOrgStatisticsAreaAll
             };
-            #endregion
-
-            #region 企业服务办件情况
-            var enterpriseOrderDto = await _orderRepository.Queryable()
+			#endregion
+
+			#region 企业服务办件情况
+
+			//工单 信件情况
+			var enterpriseOrderData = await _orderRepository.Queryable()
+				.LeftJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id)
+				.Where((x, so) => x.CreationTime >= StartTime && x.CreationTime <= EndTime && x.IdentityType == EIdentityType.Enterprise)
+				.Select((x, so) => new EnterpriseOrderDto
+				{
+					InProgressCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status < EOrderStatus.Filed, 1, 0)),
+					CompletedCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed, 1, 0)),
+					CenterCount = SqlFunc.AggregateSum(SqlFunc.IIF(so.IsCenter, 1, 0)),
+					CityCount = SqlFunc.AggregateSum(SqlFunc.IIF(so.OrgType == EOrgType.City, 1, 0)),
+					CountyCount = SqlFunc.AggregateSum(SqlFunc.IIF(so.OrgType == EOrgType.County, 1, 0)),
+				})
+				.FirstAsync();
+
+			var enterpriseOrderDto = await _orderRepository.Queryable()
                 .LeftJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id)
                 .Where((x, so) => x.CreationTime >= StartTime && x.CreationTime <= EndTime && x.IdentityType == EIdentityType.Enterprise)
                 .Select((x, so) => new
@@ -2553,8 +2569,13 @@ namespace Hotline.Api.Controllers.Bi
                 })
                 .FirstAsync();
 
-            centerReportStatisticsDto.EnterpriseOrderDto = enterpriseOrderDto;
-            var enterpriseOrderDto2 = await _orderVisitDetailRepository.Queryable()
+			enterpriseOrderDto.InProgressCount = enterpriseOrderData.InProgressCount;
+			enterpriseOrderDto.CompletedCount = enterpriseOrderData.CompletedCount;
+			enterpriseOrderDto.CenterCount = enterpriseOrderData.CenterCount;
+			enterpriseOrderDto.CityCount = enterpriseOrderData.CityCount;
+			enterpriseOrderDto.CountyCount = enterpriseOrderData.CountyCount;
+			centerReportStatisticsDto.EnterpriseOrderDto = enterpriseOrderDto;
+			var enterpriseOrderDto2 = await _orderVisitDetailRepository.Queryable()
                 .Includes(it => it.OrderVisit, ov => ov.Order)
                 .LeftJoin<SystemOrganize>((it, so) => it.VisitOrgCode == so.Id)
                 .Where((it, so) => it.VisitTarget == EVisitTarget.Org && it.OrderVisit.VisitTime >= StartTime && it.OrderVisit.VisitTime <= EndTime && it.OrderVisit.VisitState == EVisitState.Visited)

src/Hotline.Api/Controllers/OrderController.cs

@@ -3993,7 +3993,8 @@ public class OrderController : BaseController
             var pushTypes = dto.OrderPushTypes.Select(x => x.PushType);
             order.PushType = string.Join(",", pushTypes);
         }
-        if (dto.Tags != null && dto.Tags.Any())
+		order.OrderTags = new List<SystemDicData>();
+		if (dto.Tags != null && dto.Tags.Any())
         {
             var orderTags = new List<SystemDicData>();
             foreach (var item in dto.Tags)
@@ -6081,7 +6082,7 @@ public class OrderController : BaseController
             //    await _orderPublishRepository.RemoveAsync(publish, false, HttpContext.RequestAborted);
             //}
 
-            var reTransactNum = order.ReTransactNum.HasValue ? order.ReTransactNum.Value + 1 : 1;
+            //var reTransactNum = order.ReTransactNum.HasValue ? order.ReTransactNum.Value + 1 : 1;
             var orderStatus = EOrderStatus.SendBack;
             var orderStartStatus = EOrderStatus.BackToUnAccept;
 
@@ -6090,10 +6091,10 @@ public class OrderController : BaseController
                 orderStatus = model.SpecialType == ESpecialType.SendBack ? EOrderStatus.SendBack : EOrderStatus.Special;
                 orderStartStatus = model.SpecialType == ESpecialType.SendBack ? EOrderStatus.BackToUnAccept : EOrderStatus.SpecialToUnAccept;
             }
-
+			//ReTransactNum = reTransactNum,
             var Status = model.StepType == EStepType.Start ? orderStartStatus : orderStatus;
             await _orderRepository.Updateable()
-                .SetColumns(o => new Orders.Order() { ProcessType = processType, ReTransactNum = reTransactNum, Status = Status })
+                .SetColumns(o => new Orders.Order() { ProcessType = processType, Status = Status })
                 .Where(o => o.Id == order.Id)
                 .ExecuteCommandAsync(HttpContext.RequestAborted);
 

src/Hotline.Application/Orders/OrderApplication.cs

@@ -3561,6 +3561,18 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var orderExtension = await _orderDomainService.GetOrderExtensionsAsync(dto.ReceiveProvinceNo, cancellationToken);
 
         var order = await _orderRepository.GetAsync(d => d.ReceiveProvinceNo == dto.ReceiveProvinceNo, cancellationToken);
+
+        //处理省下行数据，热点名称为空
+        if (!string.IsNullOrEmpty(dto.HotspotId) && string.IsNullOrEmpty(dto.HotspotName))
+        {
+            var hotData = await _hotspotRepository.GetAsync(p => p.Id == dto.HotspotId, cancellationToken);
+            if (hotData != null)
+            {
+                dto.HotspotName = hotData.HotSpotName;
+                dto.HotspotSpliceName = hotData.HotSpotFullName;
+            }
+        }
+
         if (order is null)
         {
             order = _mapper.Map<Order>(dto);
@@ -3599,7 +3611,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 order.FileJson = await _fileRepository.AddFileAsync(files, order.Id, "", cancellationToken);
             else
                 order.FileJson = new List<Share.Dtos.File.FileJson>();
-            order.ReTransactNum++;
+            //order.ReTransactNum++;
             if (order.ProvinceReTransactNum.HasValue)
                 order.ProvinceReTransactNum = order.ProvinceReTransactNum + 1;
             else

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -226,7 +226,13 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool? IsSecret { get; set; }
 
-    }
+        /// <summary>
+        /// 是否重办
+        /// </summary>
+		public bool? IsReTransact { get; set; }
+		
+
+	}
 
 
 	public enum FiledType