From b5e47a74ad88c453bf82fb8b870b69ac9d45503f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 06 八月 2021 16:08:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java
old mode 100644
new mode 100755
index e39da5c..30ac0c0
--- a/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthStatisticsInnerServiceSMO.java
@@ -2,7 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
import org.springframework.cloud.openfeign.FeignClient;
@@ -199,10 +201,11 @@
/**
* 鏌ヨ(浼樻儬銆佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤绛�)鎬婚噾棰�
+ *
* @param reportFeeMonthStatisticsDto
* @return
*/
- @RequestMapping(value = "/queryPayFeeDetailSum",method = RequestMethod.POST)
+ @RequestMapping(value = "/queryPayFeeDetailSum", method = RequestMethod.POST)
List<ReportFeeMonthStatisticsDto> queryPayFeeDetailSum(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
/**
@@ -259,9 +262,11 @@
@RequestMapping(value = "/queryAllPaymentCount", method = RequestMethod.POST)
List<ReportFeeMonthStatisticsDto> queryAllPaymentCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+ @RequestMapping(value = "/queryReportProficientCount", method = RequestMethod.POST)
+ JSONObject queryReportProficientCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto);
+
/**
* <p>鏌ヨ灏忓尯妤间俊鎭�</p>
- *
*
* @param feeConfigDto 鏁版嵁瀵硅薄鍒嗕韩
* @return FeeConfigDto 瀵硅薄鏁版嵁
@@ -269,4 +274,48 @@
@RequestMapping(value = "/queryFeeConfigs", method = RequestMethod.POST)
List<FeeConfigDto> queryFeeConfigs(@RequestBody FeeConfigDto feeConfigDto);
+ /**
+ * 鏌ヨ缁翠慨甯堝倕鎶ヤ慨淇℃伅
+ *
+ * @param repairUserDto
+ * @return
+ */
+ @RequestMapping(value = "/queryRepair", method = RequestMethod.POST)
+ List<RepairUserDto> queryRepair(@RequestBody RepairUserDto repairUserDto);
+
+ /**
+ * 鏌ヨ鎶ヤ慨淇℃伅
+ *
+ * @param repairUserDto
+ * @return
+ */
+ @RequestMapping(value = "/queryRepairWithOutPage", method = RequestMethod.POST)
+ List<RepairUserDto> queryRepairWithOutPage(@RequestBody RepairUserDto repairUserDto);
+
+ /**
+ * 鏌ヨ鍛樺伐鎶ヤ慨琛ㄥ憳宸ヤ俊鎭�
+ *
+ * @param repairUserDto
+ * @return
+ */
+ @RequestMapping(value = "/queryRepairForStaff", method = RequestMethod.POST)
+ List<RepairUserDto> queryRepairForStaff(@RequestBody RepairUserDto repairUserDto);
+
+ /**
+ * 鏌ヨ鏈敹璐规埧灞�
+ *
+ * @param roomDto
+ * @return
+ */
+ @RequestMapping(value = "/queryNoFeeRoomsCount", method = RequestMethod.POST)
+ int queryNoFeeRoomsCount(@RequestBody RoomDto roomDto);
+
+ /**
+ * 鏌ヨ鏈敹璐规埧灞�
+ *
+ * @param roomDto 鎴垮眿
+ * @return
+ */
+ @RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.POST)
+ List<RoomDto> queryNoFeeRooms(@RequestBody RoomDto roomDto);
}
--
Gitblit v1.8.0