Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -2126,7 +2126,7 @@ public class OrderController : BaseController
     [HttpGet]
     public async Task<PagedDto<OrderDto>> Query([FromQuery] QueryOrderDto dto)
     {
-        var (total, items) = await _orderRepository.Queryable(viewFilter: true)
+        var (total, items) = await _orderRepository.Queryable(viewFilter:true)
             .Includes(x => x.OrderScreens)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!)) //标题
             .WhereIF(!string.IsNullOrEmpty(dto.ProvinceNo), d => d.ProvinceNo.Contains(dto.ProvinceNo)) //省本地编号
@@ -2252,7 +2252,7 @@ public class OrderController : BaseController
                     dto.DelayString = "延期状态：审批中  当前节点：" + workFlow?.ActualHandleStepName;
                     break;
                 case EDelayState.Pass:
-                    dto.DelayString = delayModel?.DelayNum + "个" + delayModel?.DelayUnit.GetDescription();
+                    dto.DelayString = "已延期"+delayModel?.DelayNum + "个" + delayModel?.DelayUnit.GetDescription();
                     break;
                 case EDelayState.NoPass:
                     dto.DelayString = "延期状态：拒绝 当前节点：" + workFlow?.ActualHandleStepName;
@@ -2733,8 +2733,7 @@ public class OrderController : BaseController
         var (total, items) = await _orderRepository
             .Queryable(viewFilter: true, handlerFilter: !isHandled)
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
-            .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
-                d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == true, d => d.CounterSignType.HasValue)
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false, d => !d.CounterSignType.HasValue)
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == true, d => d.ExpiredTime < DateTime.Now) //超期 未办
@@ -2763,10 +2762,10 @@ public class OrderController : BaseController
         var (total, items) = await _orderRepository.Queryable(viewFilter: false)
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(dto.IsHandled.HasValue, d => handleStatuses.Contains(d.Status))
-            .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
-                d => d.No.Contains(dto.Keyword!) || d.Title.Contains(dto.Keyword!))
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.No.Contains(dto.Keyword!) || d.Title.Contains(dto.Keyword!))
             .Where(d => string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)
             .Where(x => x.Source < ESource.MLSQ || x.Source > ESource.WZSC)
+            .Where(x => x.Status != EOrderStatus.BackToProvince)
             .OrderBy(d => d.Status)
             .OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Asc)
             .OrderByIF(dto.IsHandled == false, d => d.CreationTime, OrderByType.Desc)

src/Hotline.Api/Controllers/SettingController.cs

@@ -80,7 +80,6 @@ namespace Hotline.Api.Controllers
         /// 获取系统参数列表
         /// </summary>
         /// <returns></returns>
-        [Permission(EPermission.GetSysSettings)]
         [HttpGet("getsyssettings")]
         public async Task<PagedDto<SystemSetting>> GetSysSettings([FromQuery]SettingsQueryDto dto)
         {