Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml

@@ -48,8 +48,8 @@
     </select>
 
     <!-- 查询 费用 -->
-    <select id="getFees" parameterType="com.java110.dto.report.ReportFeeDto"
-            resultType="com.java110.dto.report.ReportFeeDto">
+    <select id="getFees" parameterType="Map"
+            resultType="Map">
         select pfc.fee_name feeName,pfc.start_time configStartTime,pfc.end_time configEndTime,pfc.config_id
         configId,pfc.fee_type_cd feeTypeCd,
         pfc.additional_amount additionalAmount,pfc.bill_type billType,pfc.computing_formula

service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java

@@ -6,6 +6,7 @@ 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;
@@ -42,8 +43,9 @@ public class ReportFeeServiceDaoImpl extends BaseServiceDao implements IReportFe
     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;
     }