From cc7ea8cafd230d7b3d9bfeefcd293632439bc397 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 22 十一月 2020 15:58:27 +0800
Subject: [PATCH] 优化代码 加入 费用抄表导出功能

---
 service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java b/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
index b361351..c5a2a05 100644
--- a/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
@@ -30,8 +30,8 @@
     public ResponseEntity<String> queryPreMeterWater(@RequestParam(value = "communityId") String communityId,
                                                      @RequestParam(value = "objId") String objId,
                                                      @RequestParam(value = "objType") String objType,
-                                                     @RequestParam(value = "roomNum" ,required = false) String roomNum,
-                                                     @RequestParam(value = "meterType",required = false) String meterType) {
+                                                     @RequestParam(value = "roomNum", required = false) String roomNum,
+                                                     @RequestParam(value = "meterType", required = false) String meterType) {
         MeterWaterDto meterWaterDto = new MeterWaterDto();
         meterWaterDto.setObjId(objId);
         meterWaterDto.setObjType(objType);
@@ -39,6 +39,20 @@
         meterWaterDto.setRow(1);
         meterWaterDto.setCommunityId(communityId);
         meterWaterDto.setMeterType(meterType);
-        return queryPreMeterWaterImpl.query(meterWaterDto,roomNum);
+        return queryPreMeterWaterImpl.query(meterWaterDto, roomNum);
+    }
+
+    /**
+     * 鏌ヨ 瀵煎嚭妯℃澘鏁版嵁
+     *
+     * @param communityId 灏忓尯ID
+     * @return
+     * @serviceCode /meterWater/queryExportRoomAndMeterWater
+     * @path /app/meterWater/queryExportRoomAndMeterWater
+     */
+    @RequestMapping(value = "/queryExportRoomAndMeterWater", method = RequestMethod.GET)
+    public ResponseEntity<String> queryExportRoomAndMeterWater(@RequestParam(value = "communityId") String communityId,
+                                                               @RequestParam(value = "meterType") String meterType) {
+        return  queryPreMeterWaterImpl.queryExportRoomAndMeterWater(communityId,meterType);
     }
 }

--
Gitblit v1.8.0