田爽 7 kuukautta sitten
vanhempi
commit
91850716f7

+ 11 - 3
src/Hotline.Api/Controllers/OrderController.cs

@@ -4296,12 +4296,20 @@ public class OrderController : BaseController
     /// <param name="id"></param>
     /// <returns></returns>
     [HttpGet("order_previous/{id}")]
-    public async Task<OrderSendBackAudit> OrderSendBackEntity(string id)
+    public async Task<SendBackDto> OrderSendBackEntity(string id)
     {
-        return await _orderSendBackAuditRepository.Queryable()
+        var res =  await _orderSendBackAuditRepository.Queryable()
             .Includes(x => x.Order)
             .FirstAsync(x => x.Id == id);
-    }
+        var resDto = _mapper.Map<SendBackDto>(res);
+        if (res.FileJson != null && res.FileJson.Any())
+        {
+	        var ids = order.FileJson.Select(x => x.Id).ToList();
+	        var files = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
+	        resDto.Files = files.Where(x => x.Classify == "退回附件" && string.IsNullOrEmpty(x.FlowKey)).ToList();
+        }
+        return resDto;
+	}
 
     /// <summary>
     /// 列表页面基础数据

+ 4 - 1
src/Hotline.Share/Dtos/Order/SendBackDto.cs

@@ -122,7 +122,10 @@ namespace Hotline.Share.Dtos.Order
 		}
 
 		public bool IsReturnAgainShow => ApplyOrgId != "001" && SendBackOrgId == "001";
-
+		/// <summary>
+		/// 附件列表
+		/// </summary>
+		public List<FileDto> Files { get; set; } = new();
 	}
 	public class SendBackBaseDto
 	{