优化查询

service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java

@@ -108,7 +108,8 @@ public class ImportFeeApi {
                                                        @RequestParam(value = "floorNum", required = false) String floorNum,
                                                        @RequestParam(value = "unitNum", required = false) String unitNum,
                                                        @RequestParam(value = "roomNum", required = false) String roomNum,
-                                                       @RequestParam(value = "importFeeId") String importFeeId) {
+                                                       @RequestParam(value = "feeId", required = false) String feeId,
+                                                       @RequestParam(value = "importFeeId", required = false) String importFeeId) {
         ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
         importFeeDetailDto.setPage(page);
         importFeeDetailDto.setRow(row);
@@ -117,6 +118,7 @@ public class ImportFeeApi {
         importFeeDetailDto.setFloorNum(floorNum);
         importFeeDetailDto.setUnitNum(unitNum);
         importFeeDetailDto.setRoomNum(roomNum);
+        importFeeDetailDto.setFeeId(feeId);
         return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
     }
 

service-fee/src/main/java/com/java110/fee/cmd/feeConfig/ListConfigFeeObjsCmd.java

@@ -5,19 +5,14 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.PageDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
-import com.java110.vo.api.feeConfig.ApiFeeConfigDataVo;
-import com.java110.vo.api.feeConfig.ApiFeeConfigVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.text.ParseException;

service-fee/src/main/java/com/java110/fee/cmd/meterWater/ListMeterWaterCmd.java

@@ -54,9 +54,9 @@ import org.slf4j.LoggerFactory;
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
 @Java110Cmd(serviceCode = "meterWater.listMeterWaters")
-public class ListMeterWaterCmd extends Cmd {
+public class ListMeterWatersCmd extends Cmd {
 
-    private static Logger logger = LoggerFactory.getLogger(ListMeterWaterCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListMeterWatersCmd.class);
 
     @Autowired
     private IMeterWaterV1InnerServiceSMO meterWaterV1InnerServiceSMOImpl;