调整【提起甄别审批统计】

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -4085,7 +4085,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 {
                     AuditName = x.HandlerName,
                     StepName = x.Name,
-                    AuditNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceType == EWorkflowTraceType.Normal && x.TraceState == EWorkflowTraceState.Normal, 1, 0)),
+                    //AuditNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceType == EWorkflowTraceType.Normal && x.TraceState == EWorkflowTraceState.Normal, 1, 0)),
+                    AuditNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceType == EWorkflowTraceType.Normal && x.TraceState == EWorkflowTraceState.Normal && x.ReviewResult == EReviewResult.Approval, 1, 0)),
+                    AuditNoNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceType == EWorkflowTraceType.Normal && x.TraceState == EWorkflowTraceState.Normal && x.ReviewResult == EReviewResult.Failed, 1, 0)),
                     AuditBackNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceState == EWorkflowTraceState.StepRemoveByPrevious || x.TraceState == EWorkflowTraceState.StepRemoveByRecall, 1, 0)),
                 });
         }
@@ -4098,7 +4100,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                .Where(x => x.HandlerName != null && x.HandlerName != "")
                .WhereIF(dto.AuditType is 1, x => x.Name == "班长审批")
                .WhereIF(dto.AuditType is 2, x => x.Name == "中心领导")
-                .WhereIF(_appOptions.Value.IsZiGong && dto.AuditType is 3, x => x.Name == "中心初审")
+               .WhereIF(_appOptions.Value.IsZiGong && dto.AuditType is 3, x => x.Name == "中心初审")
                .GroupBy(x => new { x.HandlerName })
                .Select(x => new OrderScreenAuditVo
                {

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

@@ -916,10 +916,10 @@ namespace Hotline.Share.Dtos.Order
 
         public string StepName { get; set; }
 
-		/// <summary>
-		/// 派单量
-		/// </summary>
-		public int SendOrderNum { get; set; }
+        /// <summary>
+        /// 派单量
+        /// </summary>
+        public int SendOrderNum { get; set; }
 
         /// <summary>
         /// 待派单量
@@ -933,21 +933,21 @@ namespace Hotline.Share.Dtos.Order
 
         //public string AccuracyRate { get; set; }
 
-		public string AccuracyRate => GetAccuracyRateRate();
+        public string AccuracyRate => GetAccuracyRateRate();
 
-		public string GetAccuracyRateRate()
-		{
+        public string GetAccuracyRateRate()
+        {
             if (ReSendOrderNum == 0)
             {
                 return "100%";
             }
-			if (SendOrderNum > 0 &&  ReSendOrderNum > 0)
-			{
-				return Math.Round(((SendOrderNum- ReSendOrderNum) / (double)SendOrderNum) * 100, 2).ToString() +"%";
-			}
-			return "0%";
-		}
-	}
+            if (SendOrderNum > 0 && ReSendOrderNum > 0)
+            {
+                return Math.Round(((SendOrderNum - ReSendOrderNum) / (double)SendOrderNum) * 100, 2).ToString() + "%";
+            }
+            return "0%";
+        }
+    }
 
     public class OrderReTransactVo
     {
@@ -1597,6 +1597,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public int AuditNum { get; set; }
 
+        /// <summary>
+        /// 审批不同意数量
+        /// </summary>
+        public int AuditNoNum { get; set; }
+
         /// <summary>
         /// 退回数量
         /// </summary>
@@ -1605,7 +1610,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 小计
         /// </summary>
-        public int Total => AuditNum + AuditBackNum;
+        public int Total => AuditNum + AuditNoNum + AuditBackNum;
     }
 
     public class OrderCenterAcceptVo : OrderCenterBaseVo