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 |   77 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 3 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 7cfb9c4..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,9 +3,10 @@
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.reportOweFee.ReportOweFeeDto;
+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;
@@ -13,6 +14,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName FloorInnerServiceSMOImpl
@@ -47,8 +49,28 @@
     public int deleteReportOweFee(@RequestBody ReportOweFeePo reportOweFeePo) {
         int saveFlag = 1;
         reportOweFeePo.setStatusCd("1");
-        reportOweFeeServiceDaoImpl.updateReportOweFeeInfo(BeanConvertUtil.beanCovertMap(reportOweFeePo));
+        reportOweFeeServiceDaoImpl.deleteReportOweFeeInfo(BeanConvertUtil.beanCovertMap(reportOweFeePo));
         return saveFlag;
+    }
+
+    /**
+     * 鏌ヨ<p>灏忓尯妤�</p>鎬昏褰曟暟
+     *
+     * @param reportOweFeeDto 鏁版嵁瀵硅薄鍒嗕韩
+     * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
+     */
+    public int deleteInvalidFee(@RequestBody Map reportOweFeeDto){
+        return reportOweFeeServiceDaoImpl.deleteInvalidFee(reportOweFeeDto);
+    }
+
+    @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
@@ -77,7 +99,56 @@
     public List<ReportOweFeeDto> queryReportAllOweFees(@RequestBody ReportOweFeeDto reportOweFeeDto) {
         List<ReportOweFeeDto> reportOweFees = BeanConvertUtil.covertBeanList(reportOweFeeServiceDaoImpl.queryReportAllOweFees(BeanConvertUtil.beanCovertMap(reportOweFeeDto)), ReportOweFeeDto.class);
         return reportOweFees;
+    }
 
+    /**
+     * 鏌ヨ娆犺垂(涓庢埧灞嬪叧鑱�)
+     *
+     * @param reportOweFeeDto
+     * @return
+     */
+    @Override
+    public List<ReportOweFeeDto> queryReportAllOweFeesByRoom(@RequestBody ReportOweFeeDto reportOweFeeDto) {
+        List<ReportOweFeeDto> reportOweFees = BeanConvertUtil.covertBeanList(reportOweFeeServiceDaoImpl.queryReportAllOweFeesByRoom(BeanConvertUtil.beanCovertMap(reportOweFeeDto)), ReportOweFeeDto.class);
+        return reportOweFees;
+    }
+
+    /**
+     * 鏌ヨ娆犺垂(涓庤溅杈嗗叧鑱�)
+     *
+     * @param reportOweFeeDto
+     * @return
+     */
+    @Override
+    public List<ReportOweFeeDto> queryReportAllOweFeesByCar(@RequestBody ReportOweFeeDto reportOweFeeDto) {
+        List<ReportOweFeeDto> reportOweFees = BeanConvertUtil.covertBeanList(reportOweFeeServiceDaoImpl.queryReportAllOweFeesByCar(BeanConvertUtil.beanCovertMap(reportOweFeeDto)), ReportOweFeeDto.class);
+        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));
+    }
+
+    @Override
+    public List<ReportOweFeeItemDto> computeReportOweFeeItemAmount(@RequestBody ReportOweFeeDto reportOweFeeDto) {
+        List<ReportOweFeeItemDto> reportOweFees = BeanConvertUtil.covertBeanList(
+                reportOweFeeServiceDaoImpl.computeReportOweFeeItemAmount(BeanConvertUtil.beanCovertMap(reportOweFeeDto)), ReportOweFeeItemDto.class);
+        return reportOweFees;
     }
 
     public IReportOweFeeServiceDao getReportOweFeeServiceDaoImpl() {

--
Gitblit v1.8.0