From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化
---
java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
index 60ba9a7..4a3dc86 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="reportFeeServiceDaoImpl">
<!-- 鏌ヨ瀹炴敹閲戦 -->
<select id="getFeeReceivedAmount" parameterType="com.java110.dto.report.ReportFeeDetailDto" resultType="Map">
-
select SUM(t.received_amount) receivedAmount
from pay_fee_detail t
<if test="configId != null and configId != ''">
@@ -49,8 +47,7 @@
</select>
<!-- 鏌ヨ 璐圭敤 -->
- <select id="getFees" parameterType="Map"
- resultType="Map">
+ <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
@@ -64,8 +61,9 @@
storeTypeCd,
t.community_id communityId,pfa.value importFeeName,ifd.end_time importFeeEndTime,mw.cur_degrees
curDegrees,mw.pre_degrees preDegrees,
- mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price mwPrice,
- pfa2.`value` ownerTel, pfa3.`value` ownerName,br.room_area roomArea,
+ mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price
+ mwPrice,
+ pfa2.`value` ownerTel, pfa3.`value` ownerName,br.room_area roomArea,
pfc.pay_online payOnline,pfc.scale,pfc.decimal_place decimalPlace,pfc.units,br.room_rent roomRent
from pay_fee t
INNER JOIN pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -183,6 +181,4 @@
limit #{page}, #{row}
</if>
</select>
-
-
</mapper>
--
Gitblit v1.8.0