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

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -319,7 +319,7 @@ namespace Hotline.Application.Subscribers
             //    .FirstAsync(cancellationToken);
 
             var orderScreen = await _orderScreenRepository.Queryable()
-                .Where(x => x.Order.ProvinceNo == dto.ProvinceScreenResult.CaseSerial && 
+                .Where(x => x.Order.ProvinceNo == dto.ProvinceScreenResult.CaseSerial &&
                             x.Status == EScreenStatus.Approval)
                 .FirstAsync(cancellationToken);
 
@@ -593,6 +593,15 @@ namespace Hotline.Application.Subscribers
             await _orderDomainService.AddOrderComplementAsync(dto, cancellationToken);
         }
 
+        /// <summary>
+        /// 接收省上上传附件
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        /// <exception cref="ArgumentOutOfRangeException"></exception>
+        [CapSubscribe(EventNames.SharingFileInfo)]
         public async Task RecFilesAsync(ReceiveFilesFromDsDto dto, CancellationToken cancellationToken)
         {
             if (dto.Files == null || !dto.Files.Any())
@@ -668,7 +677,7 @@ namespace Hotline.Application.Subscribers
                     await _orderComplementRepository.UpdateAsync(complement, cancellationToken);
                     break;
                 case EDsBisType.OrderHandleResult:
-                    var order1 = await _orderRepository.GetAsync(d=>d.ProvinceNo == dto.ProvinceNo, cancellationToken);
+                    var order1 = await _orderRepository.GetAsync(d => d.ProvinceNo == dto.ProvinceNo, cancellationToken);
                     if (order1 is null)
                         throw new UserFriendlyException($"无效工单编号, ProvinceNo: {dto.ProvinceNo}");
                     if (string.IsNullOrEmpty(order1.WorkflowId))

src/Hotline.Share/Mq/EventNames.Share.cs

@@ -94,5 +94,10 @@
         /// 市州互转 接收原始数据
         /// </summary>
         public const string SharingOrderReceiveTranspondCity = "sharing.order.receive.transpond.city";
+
+        /// <summary>
+        /// 接受省上上传附件
+        /// </summary>
+        public const string SharingFileInfo = "sharing.file.info";
     }
 }