From fe667a39c8a4e713b86c5d8b5d57ab42421190e6 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 01:23:01 +0800
Subject: [PATCH] 优化后端代理
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java b/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
index 633e8af..566d02f 100755
--- a/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
@@ -1,12 +1,11 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.FloorDto;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.report.ReportDeposit;
-import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
-import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
+import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
+import com.java110.po.reportFee.ReportFeeMonthStatisticsPo;
import com.java110.report.bmo.reportFeeMonthStatistics.IDeleteReportFeeMonthStatisticsBMO;
import com.java110.report.bmo.reportFeeMonthStatistics.IGetReportFeeMonthStatisticsBMO;
import com.java110.report.bmo.reportFeeMonthStatistics.ISaveReportFeeMonthStatisticsBMO;
@@ -21,7 +20,6 @@
import java.util.Calendar;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@RestController
@@ -301,6 +299,8 @@
@RequestParam(value = "configId", required = false) String configId,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "feeStartTime", required = false) String feeStartTime,
+ @RequestParam(value = "feeEndTime", required = false) String feeEndTime,
@RequestParam(value = "objId", required = false) String objId,
@RequestParam(value = "roomName", required = false) String roomName,
@RequestParam(value = "page") int page,
@@ -321,6 +321,8 @@
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setFeeStartTime(feeStartTime);
+ reportFeeMonthStatisticsDto.setFeeEndTime(feeEndTime);
reportFeeMonthStatisticsDto.setObjId(objId);
if(!StringUtil.isEmpty(roomName)){
String[] roomNameArray = roomName.split("-",3);
--
Gitblit v1.8.0