From d3e23e26fcfc17e770fca7c29b290ef5082e5734 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 04 七月 2023 22:32:00 +0800
Subject: [PATCH] 优化1.5报表相关bug
---
service-report/src/main/java/com/java110/report/smo/impl/ReportOweFeeInnerServiceSMOImpl.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 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 f5fa1f6..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,10 +3,10 @@
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;
@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -50,6 +51,26 @@
reportOweFeePo.setStatusCd("1");
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
@@ -104,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