Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -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);
			}


			}