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

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

@@ -1,4 +1,6 @@
 using Hotline.Application.Bigscreen;
+using Hotline.Caching.Interfaces;
+using Hotline.Settings;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -7,16 +9,19 @@ namespace Hotline.Api.Controllers.Bigscreen
 	public class SeatController : BaseController
 	{
 		private readonly ISeatStateDataService _seatStateDataService;
+		private readonly ISystemSettingCacheManager _systemSettingCacheManager;
 
-		public SeatController(ISeatStateDataService seatStateDataService) {
-			_seatStateDataService = seatStateDataService;
-		}
+        public SeatController(ISeatStateDataService seatStateDataService, ISystemSettingCacheManager systemSettingCacheManager)
+        {
+            _seatStateDataService = seatStateDataService;
+            _systemSettingCacheManager = systemSettingCacheManager;
+        }
 
-		/// <summary>
-		/// 首次进入大屏获取数据
-		/// </summary>
-		/// <returns></returns>
-		[AllowAnonymous]
+        /// <summary>
+        /// 首次进入大屏获取数据
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
 		[HttpGet("base_data")]
 		public async Task<object> GetSeatStateData() {
 			var call24 = await _seatStateDataService.GetCall24(HttpContext.RequestAborted);
@@ -25,5 +30,17 @@ namespace Hotline.Api.Controllers.Bigscreen
 			var callAverage = await _seatStateDataService.GetCallAverage(HttpContext.RequestAborted);
 			return new object[] { call24, callTop10, callList, callAverage };
 		}
-	}
+
+        /// <summary>
+        /// 获取监听分机
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpGet("query-listentels")]
+        public async Task<object> GetListenTels()
+        {
+            var listenTels = _systemSettingCacheManager.GetSetting(SettingConstants.ListenTels)?.SettingValue;
+            return listenTels;
+        }
+    }
 }

src/Hotline.Application/Orders/OrderApplication.cs

@@ -2015,14 +2015,14 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             {
                 EmpId = x.EmployeeId,
                 EmpName = x.Employee.Name,
-                OrgJudeCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue, 1, 0)), //部门扭转总件
-                OrgJudeApprovalingCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue && x.JudgeState == EJudgeState.Judging, 1, 0)),
-                OrgJudeSuccessCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue && x.JudgeState == EJudgeState.Agreed, 1, 0)),
-                OrgJudeFailCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue && x.JudgeState == EJudgeState.UnAgreed, 1, 0)),
-                SeatJudeCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue, 1, 0)),
-                SeatJudeApprovalingCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue && x.JudgeState == EJudgeState.Judging, 1, 0)),
-                SeatJudeSuccessCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue && x.JudgeState == EJudgeState.Agreed, 1, 0)),
-                SeatJudeFailCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue && x.JudgeState == EJudgeState.UnAgreed, 1, 0))
+                OrgJudeCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue && x.OrgJudge == true && x.JudgeState !=null, 1, 0)), //部门扭转总件
+                OrgJudeApprovalingCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue && x.OrgJudge == true && x.JudgeState == EJudgeState.Judging, 1, 0)),
+                OrgJudeSuccessCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue && x.OrgJudge== true && x.JudgeState == EJudgeState.Agreed, 1, 0)),
+                OrgJudeFailCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.OrgJudge.HasValue && x.OrgJudge == true && x.JudgeState == EJudgeState.UnAgreed, 1, 0)),
+                SeatJudeCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue && x.SeatJudge == true && x.JudgeState!=null, 1, 0)),
+                SeatJudeApprovalingCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue && x.SeatJudge == true && x.JudgeState == EJudgeState.Judging, 1, 0)),
+                SeatJudeSuccessCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue && x.SeatJudge == true && x.JudgeState == EJudgeState.Agreed, 1, 0)),
+                SeatJudeFailCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.SeatJudge.HasValue && x.SeatJudge == true && x.JudgeState == EJudgeState.UnAgreed, 1, 0))
             });
     }
 

src/Hotline/Settings/SettingConstants.cs

@@ -469,5 +469,10 @@ namespace Hotline.Settings
         /// 企业专席配置	
         /// </summary>
         public const string EnterpriseSeats = "EnterpriseSeats";
+
+        /// <summary>
+        /// 监听分机号
+        /// </summary>
+        public const string ListenTels = "ListenTels";
     }
 }