From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/components/assetImport/ImportRoomFeeComponent.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/components/assetImport/ImportRoomFeeComponent.java b/service-api/src/main/java/com/java110/api/components/assetImport/ImportRoomFeeComponent.java
index 97e18de..ac907f7 100644
--- a/service-api/src/main/java/com/java110/api/components/assetImport/ImportRoomFeeComponent.java
+++ b/service-api/src/main/java/com/java110/api/components/assetImport/ImportRoomFeeComponent.java
@@ -4,6 +4,8 @@
import com.java110.api.controller.component.CallComponentController;
import com.java110.api.smo.assetExport.IExportRoomSMO;
import com.java110.api.smo.assetImport.IImportRoomFeeSMO;
+import com.java110.core.context.PageData;
+import com.java110.dto.app.AppDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,7 @@
* @return ResponseEntity 瀵硅薄
*/
public ResponseEntity<String> uploadContactFile(IPageData pd, MultipartFile uploadFile) throws Exception {
+
return importRoomFeeSMOImpl.importFile(uploadFile);
}
@@ -66,8 +69,9 @@
* @return ResponseEntity 瀵硅薄
*/
public ResponseEntity<Object> exportData(IPageData pd) throws Exception {
-
- return exportRoomSMOImpl.exportExcelData(pd);
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(),pd.getToken(), pd.getReqData(), pd.getComponentCode(), pd.getComponentMethod(), "",
+ pd.getSessionId(), AppDto.WEB_APP_ID,pd.getHeaders());
+ return exportRoomSMOImpl.exportExcelData(newPd);
}
--
Gitblit v1.8.0