From 2fb3883ef80fc5818d09f252dbbf7d5fbae2b2ea Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Tue, 1 Aug 2023 10:59:51 +0800
Subject: [PATCH] =?UTF-8?q?PUB=E7=BB=93=E7=AE=97=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Dtos/PUB_SA_DTO.cs              | 17 +++++++++++++++++
 .../Entities/BQ/PUB_SA_SERVICE.cs               |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
index f7c40795..afc591b0 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
@@ -1,4 +1,5 @@
 using Magicodes.ExporterAndImporter.Core;
+using Microsoft.AspNetCore.Http;
 using System;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
@@ -40,6 +41,22 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public EnumBusinessType BusinessType { get; set; }
     }
 
+    /// <summary>
+    /// 导入请求
+    /// </summary>
+    public class PUB_SAImportRequestDto
+    {
+        /// <summary>
+        /// 文件
+        /// </summary>
+        public IFormFileCollection Files { get; set; }
+
+        /// <summary>
+        /// 是否是备件
+        /// </summary>
+        public EnumBusinessType BusinessType { get; set; }
+    }
+
     /// <summary>
     /// 导入
     /// </summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
index 49fe1f70..57545332 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
@@ -105,9 +105,9 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
     /// 导入
     /// </summary>
     [HttpPost]
-    public async Task<string> ImportByBusinessTypeAsync([FromForm] IFormFileCollection files, EnumBusinessType businessType)
+    public async Task<string> ImportByBusinessTypeAsync([FromForm] PUB_SAImportRequestDto pubSaImportRequestDto)
     {
-        return await ImportAsync(files, businessType);
+        return await ImportAsync(pubSaImportRequestDto.Files, pubSaImportRequestDto.BusinessType);
     }
     #endregion