From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-api/src/main/java/com/java110/api/components/assetImport/ImportAndExportFeeComponent.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/components/assetImport/ImportAndExportFeeComponent.java b/service-api/src/main/java/com/java110/api/components/assetImport/ImportAndExportFeeComponent.java
index 63ec9ee..5f58d29 100644
--- a/service-api/src/main/java/com/java110/api/components/assetImport/ImportAndExportFeeComponent.java
+++ b/service-api/src/main/java/com/java110/api/components/assetImport/ImportAndExportFeeComponent.java
@@ -1,6 +1,7 @@
package com.java110.api.components.assetImport;
import com.java110.api.smo.assetExport.IExportRoomSMO;
+import com.java110.api.smo.assetImport.IImportCustomCreateFeeSMO;
import com.java110.api.smo.assetImport.IImportRoomFeeSMO;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
@@ -22,7 +23,7 @@
@Autowired
- private IImportRoomFeeSMO importRoomFeeSMOImpl;
+ private IImportCustomCreateFeeSMO importCustomCreateFeeSMOImpl;
@Autowired
private IExportRoomSMO exportRoomSMOImpl;
@@ -35,7 +36,7 @@
*/
public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception {
- return importRoomFeeSMOImpl.importExcelData(pd, uploadFile);
+ return importCustomCreateFeeSMOImpl.importCustomExcelData(pd, uploadFile);
}
@@ -52,4 +53,17 @@
}
+ /**
+ * 娣诲姞搴旂敤鏁版嵁
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
+ * @return ResponseEntity 瀵硅薄
+ */
+ public ResponseEntity<Object> exportCustomReportTableData(IPageData pd) throws Exception {
+ 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.exportCustomReportTableData(newPd);
+ }
+
+
}
--
Gitblit v1.8.0