Przeglądaj źródła

中心统计报表统计

田爽 2 miesięcy temu
rodzic
commit
06bab14615

+ 3 - 3
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -2628,7 +2628,7 @@ namespace Hotline.Api.Controllers.Bi
                     OrderCount = SqlFunc.AggregateSum(SqlFunc.IIF(true, 1, 0)),
                     CompletedAging = SqlFunc.AggregateSum(SqlFunc.IIF(temp.FileOrgIsCenter, temp.CreationTimeHandleDurationWorkday, temp.CenterToOrgHandleDurationWorkday)),
                     CityOrderCount = SqlFunc.AggregateSum(SqlFunc.IIF(temp.FileOrgIsCenter == false && temp.OrgType == EOrgType.City, 1, 0)),//市级
-                    CityCompletedAging = SqlFunc.AggregateSum(SqlFunc.IIF(temp.FileOrgIsCenter == false && temp.OrgType == EOrgType.City, temp.CenterToOrgHandleDurationWorkday, 0)),
+                    CityCompletedAging = SqlFunc.AggregateSum(SqlFunc.IIF(temp.FileOrgIsCenter == false && temp.OrgType == EOrgType.City, temp.CenterToOrgHandleDurationWorkday/60/24, 0)),
                     CountyOrderCount = SqlFunc.AggregateSum(SqlFunc.IIF(temp.FileOrgIsCenter == false && temp.OrgType == EOrgType.County, 1, 0)),//区县
                     CountyCompletedAging = SqlFunc.AggregateSum(SqlFunc.IIF(temp.FileOrgIsCenter == false && temp.OrgType == EOrgType.County, temp.CenterToOrgHandleDurationWorkday, 0)),
                     CenterOrderCount = SqlFunc.AggregateSum(SqlFunc.IIF(temp.FileOrgIsCenter, 1, 0)),//中心
@@ -2646,10 +2646,10 @@ namespace Hotline.Api.Controllers.Bi
                 .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 && it.OrderVisit.Order.IdentityType == EIdentityType.Enterprise)
-                .GroupBy((it, so) => it.Id)
+                //.GroupBy((it, so) => it.Id)
                  .Select((it, so) => new EnterpriseOrderDto
                  {
-                     VisitdCount = SqlFunc.AggregateSum(SqlFunc.IIF(true, 1, 0)),
+                     VisitdCount = SqlFunc.AggregateCount(1),
                      Dissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2"), 1, 0)),
                      Satisfied = SqlFunc.AggregateSum(SqlFunc.IIF(!SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") && !SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2"), 1, 0)),
                      CityDissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF((SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2")) && so.OrgType == EOrgType.City, 1, 0)),

+ 3 - 3
src/Hotline.Share/Dtos/CallCenter/CenterReportStatisticsDto.cs

@@ -713,7 +713,7 @@ namespace Hotline.Share.Dtos.CallCenter
 		{
 			if (Satisfied > 0 )
 				return Math.Round(((double)Satisfied / (double)(Satisfied + Dissatisfied)) * 100, 2);
-			return 0;
+			return 100;
 		}
 
 		/// <summary>
@@ -726,7 +726,7 @@ namespace Hotline.Share.Dtos.CallCenter
 		{
 			if (CitySatisfied > 0)
 				return Math.Round(((double)CitySatisfied / (double)(CitySatisfied + CityDissatisfied)) * 100, 2);
-			return 0;
+			return 100;
 		}
 
 		/// <summary>
@@ -739,7 +739,7 @@ namespace Hotline.Share.Dtos.CallCenter
 		{
 			if (CountySatisfied > 0)
 				return Math.Round(((double)CountySatisfied / (double)(CountySatisfied + CountyDissatisfied)) * 100, 2);
-			return 0;
+			return 100;
 		}
 	}