From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java b/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java
old mode 100644
new mode 100755
index 34267f8..cb16379
--- a/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java
+++ b/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java
@@ -2,11 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.report.ReportFeeDetailDto;
import com.java110.dto.report.ReportFeeDto;
import com.java110.report.dao.IReportFeeServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -41,9 +43,19 @@
public List<ReportFeeDto> getFees(ReportFeeDto reportFeeDto) {
logger.debug("鏌ヨ璐圭敤淇℃伅 鍏ュ弬 info : {}", JSONObject.toJSONString(reportFeeDto));
- List<ReportFeeDto> roomDtos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFees", reportFeeDto);
-
+ //List<ReportFeeDto> roomDtos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFees", reportFeeDto);
+ List<Map> roomMaps = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFees", BeanConvertUtil.beanCovertMap(reportFeeDto));
+ List<ReportFeeDto> roomDtos = BeanConvertUtil.covertBeanList(roomMaps,ReportFeeDto.class);
return roomDtos;
+ }
+
+ @Override
+ public List<Map> getFeeConfigs(Map reportFeeDto) {
+ logger.debug("getFeeConfigs 鍏ュ弬 info : {}", JSONObject.toJSONString(reportFeeDto));
+
+ List<Map> feeConfigDtos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFeeConfigs", reportFeeDto);
+
+ return feeConfigDtos;
}
@Override
@@ -55,8 +67,8 @@
return 0;
}
- Object receivedAmount = businessReportFeeMonthStatisticsInfos.get(0).get("receivedAmount");
+ Map receivedAmount = businessReportFeeMonthStatisticsInfos.get(0);
- return Double.parseDouble(receivedAmount == null ? "0" : receivedAmount.toString());
+ return Double.parseDouble(receivedAmount == null ? "0" : receivedAmount.get("receivedAmount").toString());
}
}
--
Gitblit v1.8.0