Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -994,7 +994,6 @@ public class OrderController : BaseController
         model.BeforeDelay = order.ExpiredTime;
         model.DelayState = EDelayState.Examining;
         model.DelayReason = dto.Workflow.Opinion;
-        model.FileIds = dto.Workflow.Files;
 
         if (model.BeforeDelay != null)
         {
@@ -1004,21 +1003,23 @@ public class OrderController : BaseController
 
         model.ApplyDelayTime = DateTime.Now;
         model.No = order.No;
-        var id = await _orderDelayRepository.AddAsync(model, HttpContext.RequestAborted);
+        model.InitId();
+        if (dto.Data.Files.Any()) model.FileJson = await _fileRepository.AddFileAsync(dto.Data.Files, model.Id, "", HttpContext.RequestAborted);
+		await _orderDelayRepository.AddAsync(model, HttpContext.RequestAborted);
         try
         {
             var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
             startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderDelay;
             startDto.Title = model.DelayReason;
             string workFlowId =
-                await _workflowApplication.StartWorkflowAsync(startDto, id,
+                await _workflowApplication.StartWorkflowAsync(startDto, model.Id,
                     cancellationToken: HttpContext.RequestAborted);
             model.WorkflowId = workFlowId;
             await _orderDelayRepository.UpdateAsync(model, HttpContext.RequestAborted);
         }
         catch (Exception ex)
         {
-            await _orderDelayRepository.RemoveAsync(id, false, HttpContext.RequestAborted);
+            await _orderDelayRepository.RemoveAsync(model.Id, false, HttpContext.RequestAborted);
             throw new UserFriendlyException($"工单延期流程失败!, {ex.Message}", "工单延期流程失败");
         }
     }
@@ -1062,7 +1063,9 @@ public class OrderController : BaseController
             .FirstAsync(x => x.Id == id);
         var rspModel = _mapper.Map<OrderDelayDto>(model);
         rspModel.IsCanHandle = model.Workflow.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
-        return rspModel;
+        var files = await _fileRepository.Queryable().Where(x => x.Key == rspModel.Id && string.IsNullOrEmpty(x.FlowKey)).ToListAsync();
+        if (files.Any()) rspModel.Files = _mapper.Map<List<FileDto>>(files);
+		return rspModel;
     }
 
     /// <summary>
@@ -1296,6 +1299,8 @@ public class OrderController : BaseController
             .FirstAsync(x => x.Id == id);
         var rspModel = _mapper.Map<OrderScreenListDto>(model);
         rspModel.IsCanHandle = model.Workflow.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
+        var files = await _fileRepository.Queryable().Where(x => x.Key == rspModel.Id && string.IsNullOrEmpty(x.FlowKey)).ToListAsync();
+        if (files.Any()) rspModel.Files = _mapper.Map<List<FileDto>>(files);
         return rspModel;
     }
 
@@ -1486,7 +1491,6 @@ public class OrderController : BaseController
 				var replyFiles = files.Where(x => x.Classify == "督办回复").ToList();
 				if (replyFiles.Any()) orderSuperviseDto.ReplyFiles = _mapper.Map<List<FileDto>>(replyFiles);
 			}
-           
 		}
 		return orderSuperviseDto;
 	}

src/Hotline.Api/Controllers/PushMessageController.cs

@@ -109,12 +109,11 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [HttpPost("receiveobtain")]
         [AllowAnonymous]
-        [OriginResponse]
-        public string ReceiveObtain([FromForm] ReceiveMessageDto receiveMessageDto)
+        public OpenResponse ReceiveObtain([FromForm] ReceiveMessageDto receiveMessageDto)
         {
             var result = _pushDomainService.ReceiveObtain(receiveMessageDto).GetAwaiter().GetResult();
 
-            return result;
+            return OpenResponse.Ok(result);
         }
 
         #endregion

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

@@ -188,6 +188,7 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public List<FileJson>? FileJson { get; set; } = new();
 
+		public List<FileDto> Files { get; set; }
 	}
 
 	public class PublishScreenDto {

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

@@ -155,7 +155,7 @@ namespace Hotline.Share.Dtos.Order
 
         public string DelayReason { get; set; }
 
-        public List<FileJson> FileJson { get; set; }
+        public List<FileDto> Files { get; set; }
     }
 
     public class PublishOrderDelayDto
@@ -352,7 +352,9 @@ namespace Hotline.Share.Dtos.Order
         /// 是否可办理
         /// </summary>
         public bool IsCanHandle { get; set; }
-    }
+
+        public List<FileDto> Files { get; set; }
+	}
 
 
     public record DelayCalcEndTimeDto

src/Hotline/DataSharing/Province/Services/ProvinceService.cs

@@ -584,7 +584,7 @@ namespace Hotline.DataSharing.Province.Services
         }
 
         /// <summary>
-        ///热线工单归档---服务工单结果/服务工单交办处理结果
+        ///热线工单归档---服务工单结果/服务工单交办处理结果----1
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -802,7 +802,7 @@ namespace Hotline.DataSharing.Province.Services
         }
 
         /// <summary>
-        /// 服务工单催单--已对接
+        /// 服务工单催单--已对接----1
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>

src/Hotline/Orders/OrderDelay.cs

@@ -91,7 +91,7 @@ namespace Hotline.Orders
         /// 附件
         /// </summary>
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
-        public List<FileDto> FileIds { get; set; }
+        public List<FileJson> FileJson { get; set; }
 
         /// <summary>
         /// 是否省延期