From 37a97e9ece1c531274b74ecf1abd41cecbb7a79f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 12 十月 2021 23:50:52 +0800
Subject: [PATCH] 优化 临时车收费标准时加入 普通收费标准
---
service-api/src/main/java/com/java110/api/components/assetImport/ImportRoomFeeComponent.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 acb75b6..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
@@ -1,9 +1,11 @@
package com.java110.api.components.assetImport;
import com.java110.core.context.IPageData;
-import com.java110.api.controller.CallComponentController;
+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