From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-report/src/main/java/com/java110/report/smo/impl/ReportOweFeeInnerServiceSMOImpl.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportOweFeeInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportOweFeeInnerServiceSMOImpl.java
index fe6e553..f71b4cc 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportOweFeeInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportOweFeeInnerServiceSMOImpl.java
@@ -3,16 +3,14 @@
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.reportOweFee.ReportOweFeeDto;
-import com.java110.dto.reportOweFee.ReportOweFeeItemDto;
+import com.java110.dto.reportFee.ReportOweFeeDto;
+import com.java110.dto.reportFee.ReportOweFeeItemDto;
 import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
-import com.java110.po.reportOweFee.ReportOweFeePo;
+import com.java110.po.reportFee.ReportOweFeePo;
 import com.java110.report.dao.IReportOweFeeServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -66,6 +64,16 @@
     }
 
     @Override
+    public List<Map> queryOweFeesByOwnerIds(@RequestBody Map info) {
+        return reportOweFeeServiceDaoImpl.queryOweFeesByOwnerIds(info);
+    }
+
+    @Override
+    public List<Map> queryOweFeesByRoomIds(@RequestBody Map info) {
+        return reportOweFeeServiceDaoImpl.queryOweFeesByRoomIds(info);
+    }
+
+    @Override
     public List<ReportOweFeeDto> queryReportOweFees(@RequestBody ReportOweFeeDto reportOweFeeDto) {
 
         //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
@@ -117,6 +125,20 @@
         return reportOweFees;
     }
 
+    /**
+     * 鏌ヨ娆犺垂(涓庡悎鍚屽叧鑱�)
+     *
+     * @param reportOweFeeDto
+     * @return
+     */
+    @Override
+    public List<ReportOweFeeDto> queryReportAllOweFeesByContract(@RequestBody ReportOweFeeDto reportOweFeeDto) {
+        List<ReportOweFeeDto> reportOweFees = BeanConvertUtil.covertBeanList(reportOweFeeServiceDaoImpl.queryReportAllOweFeesByContract(BeanConvertUtil.beanCovertMap(reportOweFeeDto)), ReportOweFeeDto.class);
+        return reportOweFees;
+    }
+
+
+
     @Override
     public double computeReportOweFeeTotalAmount(@RequestBody ReportOweFeeDto reportOweFeeDto) {
         return reportOweFeeServiceDaoImpl.computeReportOweFeeTotalAmount(BeanConvertUtil.beanCovertMap(reportOweFeeDto));

--
Gitblit v1.8.0