From 74be20dfb5b244bbae3387db7a1aecb9fc1a21bd Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 16 六月 2021 18:22:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java b/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java
old mode 100644
new mode 100755
index 468e51e..c5c50e9
--- a/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java
+++ b/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java
@@ -4,6 +4,7 @@
import com.java110.front.controller.CallComponentController;
import com.java110.front.smo.assetExport.IExportMeterWaterSMO;
import com.java110.front.smo.assetExport.IExportRoomSMO;
+import com.java110.front.smo.assetImport.IImportMeterWaterFeeSMO;
import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,7 +23,7 @@
@Autowired
- private IImportRoomFeeSMO importRoomFeeSMOImpl;
+ private IImportMeterWaterFeeSMO importMeterWaterFeeSMOImpl;
@Autowired
private IExportMeterWaterSMO exportMeterWaterSMOImpl;
@@ -35,7 +36,18 @@
*/
public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception {
- return importRoomFeeSMOImpl.importExcelData(pd, uploadFile);
+ return importMeterWaterFeeSMOImpl.importExcelData(pd, uploadFile);
+ }
+
+ /**
+ * 娣诲姞搴旂敤鏁版嵁
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
+ * @return ResponseEntity 瀵硅薄
+ */
+ public ResponseEntity<String> importData2(IPageData pd, MultipartFile uploadFile) throws Exception {
+
+ return importMeterWaterFeeSMOImpl.importExcelData2(pd, uploadFile);
}
/**
@@ -48,6 +60,16 @@
return exportMeterWaterSMOImpl.exportExcelData(pd);
}
+ /**
+ * 娣诲姞搴旂敤鏁版嵁
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
+ * @return ResponseEntity 瀵硅薄
+ */
+ public ResponseEntity<Object> exportData2(IPageData pd) throws Exception {
+
+ return exportMeterWaterSMOImpl.exportExcelData(pd);
+ }
}
--
Gitblit v1.8.0