From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码

---
 service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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
old mode 100644
new mode 100755
index c61c5fb..98f6c03
--- a/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
@@ -27,8 +27,8 @@
      */
     @RequestMapping(value = "/queryPreMeterWater", method = RequestMethod.GET)
     public ResponseEntity<String> queryPreMeterWater(@RequestParam(value = "communityId") String communityId,
-                                                     @RequestParam(value = "objId") String objId,
-                                                     @RequestParam(value = "objType") String objType,
+                                                     @RequestParam(value = "objId", required = false) String objId,
+                                                     @RequestParam(value = "objType", required = false) String objType,
                                                      @RequestParam(value = "roomNum", required = false) String roomNum,
                                                      @RequestParam(value = "meterType", required = false) String meterType) {
         MeterWaterDto meterWaterDto = new MeterWaterDto();
@@ -70,6 +70,8 @@
         Assert.hasKeyAndValue(reqJson, "configId", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤椤�");
         Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰淇℃伅涓湭鍖呭惈鍟嗘埛淇℃伅");
         Assert.hasKeyAndValue(reqJson, "feeTypeCd", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤绫诲瀷");
+        Assert.hasKeyAndValue(reqJson, "batchId", "璇锋眰淇℃伅涓湭鍖呭惈鎵规鍙�");
+        Assert.hasKeyAndValue(reqJson, "meterType", "璇锋眰淇℃伅涓湭鍖呭惈鎶勮〃绫诲瀷");
         return queryPreMeterWaterImpl.importMeterWater(reqJson);
     }
 

--
Gitblit v1.8.0