order

src/Hotline.Api/Controllers/OrderController.cs

@@ -1860,7 +1860,7 @@ public class OrderController : BaseController
     [HttpGet("urge")]
     public async Task<PagedDto<UrgeOrderDto>> UrgeList([FromQuery] UrgeListDto dto)
     {
-        var (total, items) = await _orderUrgeRepository.Queryable()
+        var (total, items) = await _orderUrgeRepository.Queryable(permissionVerify:true)
             .Includes(x => x.Order)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
@@ -2046,7 +2046,7 @@ public class OrderController : BaseController
             .WhereIF(dto.Channels.Any(), d => dto.Channels.Contains(d.SourceChannelCode)) //来源渠道
             .WhereIF(dto.HotspotIds.Any(), d => dto.HotspotIds.Contains(d.HotspotId)) //热点类型
             .WhereIF(!string.IsNullOrEmpty(dto.TransferPhone), d => d.TransferPhone.Contains(dto.TransferPhone!)) //转接号码
-                                                                                                                  //.WhereIF(dto.OrgCodes.Any(), d => d.Workflow.Assigns.Any(s => dto.OrgCodes.Contains(s.OrgCode)))
+            //.WhereIF(dto.OrgCodes.Any(), d => d.Workflow.Assigns.Any(s => dto.OrgCodes.Contains(s.OrgCode)))
             .WhereIF(dto.OrgCodes.Any(), d => dto.OrgCodes.Contains(d.ActualHandleOrgCode)) //接办部门
             .WhereIF(!string.IsNullOrEmpty(dto.NameOrNo), d => d.AcceptorName.Contains(dto.NameOrNo!) || d.AcceptorStaffNo.Contains(dto.NameOrNo!)) //受理人/坐席
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart) //受理时间开始
@@ -2070,6 +2070,8 @@ public class OrderController : BaseController
             .WhereIF(dto.IdentityType != null, d => d.IdentityType == dto.IdentityType) //来电主体
             .WhereIF(!string.IsNullOrEmpty(dto.FromName), d => d.FromName.Contains(dto.FromName)) //来电人姓名
             .WhereIF(dto.AreaCodes.Any(), d => dto.AreaCodes.Contains(d.AreaCode)) //区域
+            .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == true,x=>x.IsProvince == true)
+            .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == false,x=>x.IsProvince == false)
             .OrderByDescending(d => d.CreationTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
@@ -2758,6 +2760,49 @@ public class OrderController : BaseController
         return new PagedDto<OrderSendBackDto>(total, _mapper.Map<IReadOnlyList<OrderSendBackDto>>(items));
     }
 
+    /// <summary>
+    /// 批量省工单退回
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpPost("send_back/batch")]
+    public async Task<object> BatchApplyUrge([FromBody]List<OrderSendBackAddDto> dto)
+    {
+        int count = dto.Count;
+        int successCount = 0;
+        int errorCount = 0;
+        foreach (var item in dto)
+        {
+            //验证工单是否可以申请
+            var order = await _orderRepository.GetAsync(item.OrderId, HttpContext.RequestAborted);
+            if (order is null)
+            {
+                errorCount++;
+                continue;
+            }
+            if (order.Status > EOrderStatus.BackToUnAccept)
+            {
+                errorCount++;
+                continue;
+            }
+            if (order.Source <= ESource.HotlineImport)
+            {
+                errorCount++;
+                continue;
+            }
+            var model = _mapper.Map<OrderSendBack>(item);
+            await _orderSendBackRepository.AddAsync(model, HttpContext.RequestAborted);
+            if (!string.IsNullOrEmpty(model.Id))
+            {
+                order.Status = EOrderStatus.BackToProvince;
+                await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
+                successCount++;
+            }
+        }
+        return new { Count = count, ErrorCount = errorCount, SuccessCount = successCount };
+    }
+
+
     /// <summary>
     /// 退回申请
     /// </summary>
@@ -2772,9 +2817,9 @@ public class OrderController : BaseController
         var order = await _orderRepository.GetAsync(dto.OrderId, HttpContext.RequestAborted);
         if (order is null)
             throw UserFriendlyException.SameMessage("无效工单");
-        if ((int)order.Status > 1)
+        if (order.Status > EOrderStatus.BackToUnAccept)
             throw UserFriendlyException.SameMessage("工单状态无效,请确认当前工单状态");
-        if ((int)order.Source <= 1)
+        if (order.Source <= ESource.HotlineImport)
             throw UserFriendlyException.SameMessage("工单来源无效,请确认当前工单来源");
         var model = _mapper.Map<OrderSendBack>(dto);
         model.InitId();
@@ -2784,7 +2829,6 @@ public class OrderController : BaseController
 
         if (!string.IsNullOrEmpty(model.Id))
         {
-            order = await _orderRepository.GetAsync(dto.OrderId, HttpContext.RequestAborted);
             order.Status = EOrderStatus.BackToProvince;
             await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
         }

src/Hotline.Api/Controllers/WorkflowController.cs

@@ -48,6 +48,7 @@ public class WorkflowController : BaseController
     private readonly IRepository<WorkflowModule> _wfModuleRepository;
     private readonly IRepository<WorkflowTrace> _workflowTraceRepository;
     private readonly IRepository<WorkflowCountersign> _workflowCountersignRepository;
+    private readonly IRepository<WorkflowCountersignMember> _workflowCountersignMemberRepository;
     private readonly ISessionContext _sessionContext;
     private readonly IMapper _mapper;
     private readonly ISystemDicDataCacheManager _systemDicDataCacheManager;
@@ -70,7 +71,8 @@ public class WorkflowController : BaseController
         ISessionContext sessionContext,
         IMapper mapper,
         ISystemDicDataCacheManager systemDicDataCacheManager,
-        IFileRepository fileRepository
+        IFileRepository fileRepository,
+        IRepository<WorkflowCountersignMember> workflowCountersignMemberRepository
     )
     {
         _definitionDomainService = definitionDomainService;
@@ -90,6 +92,7 @@ public class WorkflowController : BaseController
         _workflowCountersignRepository = workflowCountersignRepository;
         _systemDicDataCacheManager = systemDicDataCacheManager;
         _fileRepository = fileRepository;
+        _workflowCountersignMemberRepository = workflowCountersignMemberRepository;
     }
 
     #region definition
@@ -573,6 +576,13 @@ public class WorkflowController : BaseController
             return dto;
         }).ToList();
 
+
+
+
+
+
+
+
         return new PagedDto<WorkflowCountersignDto>(total, dtos);
     }
 

src/Hotline.Application/Orders/OrderApplication.cs

@@ -148,7 +148,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         DateTime stTime = DateTime.Now.AddDays(int.Parse(value));
         stTime = _timeLimitDomainService.WorkDay(DateTime.Now);
         DateTime stTime2 = _timeLimitDomainService.WorkDay(DateTime.Now);
-        var (total, items) = await _orderRepository.Queryable()
+        var (total, items) = await _orderRepository.Queryable(viewFilter:true)
             .WhereIF(dto.IsProvince.HasValue, x => x.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Title.Contains(dto.Keyword!) || x.No.Contains(dto.Keyword!))
             .Where(x => x.ExpiredTime != null &&

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

@@ -138,6 +138,11 @@ namespace Hotline.Share.Dtos.Order
         /// 区域（×）(多选)
         /// </summary>
         public List<string> AreaCodes { get; set; } = new();
+
+        /// <summary>
+        /// 是否省工单（空为全部  true为省工单 false为市工单）
+        /// </summary>
+        public bool? IsProvinceOrder { get; set; }
     }