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

src/Hotline.Api/Controllers/OrderController.cs

@@ -1705,10 +1705,14 @@ public class OrderController : BaseController
 
         var visit = await _orderVisitRepository.GetAsync(dto.Data.VisitId, HttpContext.RequestAborted);
         setting = _systemSettingCacheManager.GetSetting(SettingConstants.ScreenApplyEndTime);
-        var endTime = _timeLimitDomainService
-            .CalcEndTime(visit.VisitTime.Value, ETimeType.WorkDay, int.Parse(setting?.SettingValue[0]), 0).EndTime;
-        if (DateTime.Now > endTime && int.Parse(setting?.SettingValue[0]) > 0)
-            throw UserFriendlyException.SameMessage("甄别申请时限已超过系统预定设置，不能申请");
+        var endTime = DateTime.Now;
+        if (int.Parse(setting?.SettingValue[0]) > 0)
+        {
+	        endTime = _timeLimitDomainService
+		        .CalcEndTime(visit.VisitTime.Value, ETimeType.WorkDay, int.Parse(setting?.SettingValue[0]), 0).EndTime;
+	        if (DateTime.Now > endTime)
+		        throw UserFriendlyException.SameMessage("甄别申请时限已超过系统预定设置，不能申请");
+		}
 
         var model = _mapper.Map<OrderScreen>(dto.Data);
         model.Status = EScreenStatus.Apply;

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -306,8 +306,8 @@ namespace Hotline.Application.Subscribers
             model.ReplyLimitTime = dto.ProvinceOrderSuperviseDto.SuperviseReturnDate;
             model.OrgName = org.Name;
             model.OrgId = org.Id;
-            model.CreatorOrgName = dto.ProvinceOrderSuperviseDto.SuperviseSendDept;
-            model.CreatorName = dto.ProvinceOrderSuperviseDto.SupervisePerson;
+            model.LaunchOrgName = dto.ProvinceOrderSuperviseDto.SuperviseSendDept;
+            model.CrUser = dto.ProvinceOrderSuperviseDto.SupervisePerson;
             model.State = 0;
             model.Province = true;
             model.ApplyContent = dto.ProvinceOrderSuperviseDto.SuperviseContent;

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

@@ -396,6 +396,11 @@ public class SuperviseOrderDto
     /// 督办省编号
     /// </summary>
     public string? SuperviseSerial { get; set; }
+
+    /// <summary>
+    /// 发起部门名称
+    /// </summary>
+    public string? LaunchOrgName { get; set; }
 }