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

src/Hotline.Api/Controllers/CommonPController.cs

@@ -138,7 +138,7 @@ namespace Hotline.Api.Controllers
                 .Where((x, s) => s.Id == null)
                 .Where(x => x.OrderVisit.VisitTime < DateTime.Now && x.OrderVisit.VisitTime > workTime)
                 .Where((x, s) => x.OrderVisit.VisitState != EVisitState.None && x.OrderVisit.IsCanHandle)
-                .Where((x, s) => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode.StartsWith(_sessionContext.OrgId) && (
+                .Where((x, s) => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode == _sessionContext.OrgId && (
                 SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" || SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||
                 SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" || SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2")).CountAsync();
 			return new { AboutExpire = aboutExpire, HavExpired = havExpired, CountersignHandle = countersignHandle, ScreenAudit = screenAudit, Delay = delay, ScreenHandle = screenHandle };

src/Hotline.Share/Dtos/Push/MessagePagedDto.cs

@@ -3,15 +3,39 @@ using Hotline.Share.Requests;
 
 namespace Hotline.Share.Dtos.Push
 {
-
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="PushBusiness"></param>
-    /// <param name="Status"></param>
-    /// <param name="StartTime"></param>
-    /// <param name="EndTime"></param>
-    /// <param name="TelNumber">电话号码</param>
-    /// <param name="UserName">接收人</param>
-    public record MessagePagedDto(EPushBusiness? PushBusiness, ESendState? Status, DateTime? StartTime, DateTime? EndTime, string TelNumber, string UserName) : PagedKeywordRequest;
+    public record MessagePagedDto : PagedKeywordRequest
+    {
+        /// <summary>
+        /// 推送业务类型
+        /// </summary>
+        public EPushBusiness? PushBusiness { get; set; }
+
+        /// <summary>
+        /// 发送状态
+        /// </summary>
+        public ESendState? Status { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 电话号码
+        /// </summary>
+        public string TelNumber { get; set; }
+
+        /// <summary>
+        /// 接收人
+        /// </summary>
+        public string UserName { get; set; }
+    }
 }

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -717,30 +717,30 @@ namespace Hotline.Settings.TimeLimits
         public DateTime WorkDay(DateTime date)
         {
             var workTime = _systemSettingRepository.Get(x => x.Code == SettingConstants.WorkTime);
-            if (!IsWorkDay(date))
-                date = DateTime.Parse(date.AddDays(1).ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
-            DateTime WorkBeginTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
-            DateTime WorkEndTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[1] + ":00");
-            if (date < WorkBeginTime || date > WorkEndTime)
+            if (IsWorkDay(date))
             {
-                date = date.AddDays(1);
-            }
-
-            return WorkDayRecursion(date);
-        }
-
-        private DateTime WorkDayRecursion(DateTime date)
-        {
-            var rsDate = date;
-            while (!IsWorkDay(rsDate))
-            {
-                rsDate = rsDate.AddDays(1);
-                rsDate = WorkDay(rsDate);
+                DateTime WorkBeginTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
+                DateTime WorkEndTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[1] + ":00");
+                if (date < WorkBeginTime || date > WorkEndTime)
+                {
+                    date = DateTime.Parse(date.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
+                }
             }
-            return rsDate;
+            else {
+	            while (!IsWorkDay(date))
+	            {
+		            date = date.AddDays(1);
+	            }
+	            DateTime WorkBeginTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
+	            DateTime WorkEndTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[1] + ":00");
+	            if (date < WorkBeginTime || date > WorkEndTime)
+	            {
+		            date = DateTime.Parse(date.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
+	            }
+			}
+            return date;
         }
 
-
         /// <summary>
         /// 倒推工作日
         /// </summary>