From 1d4e7dc07b0ef56d852a02ffc6f02df0d28d4549 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 23 八月 2021 16:58:31 +0800
Subject: [PATCH] 优化代码

---
 service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 16fbc47..68fa317
--- 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,9 +2,11 @@
 
 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 org.springframework.stereotype.Service;
@@ -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,6 +67,8 @@
             return 0;
         }
 
-        return Double.parseDouble(businessReportFeeMonthStatisticsInfos.get(0).get("receivedAmount").toString());
+        Map receivedAmount = businessReportFeeMonthStatisticsInfos.get(0);
+
+        return Double.parseDouble(receivedAmount == null ? "0" : receivedAmount.get("receivedAmount").toString());
     }
 }

--
Gitblit v1.8.0