From c8195a8a1c34b9fa8db9aa4dc340d4344044ce97 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 29 六月 2021 20:52:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 9e0bd3c..957ba91 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -8,10 +8,10 @@
<insert id="saveReportFeeMonthStatisticsInfo" parameterType="Map">
insert into report_fee_month_statistics(
receivable_amount,statistics_id,update_time,remark,obj_name,received_amount,fee_year,fee_month,fee_id,config_id,
- obj_id,fee_name,owe_amount,community_id,fee_create_time,obj_type,deadline_time
+ obj_id,fee_name,owe_amount,community_id,fee_create_time,obj_type,deadline_time,cur_max_time
) values (
#{receivableAmount},#{statisticsId},#{updateTime},#{remark},#{objName},#{receivedAmount},#{feeYear},#{feeMonth},
- #{feeId},#{configId},#{objId},#{feeName},#{oweAmount},#{communityId},#{feeCreateTime},#{objType},#{deadlineTime}
+ #{feeId},#{configId},#{objId},#{feeName},#{oweAmount},#{communityId},#{feeCreateTime},#{objType},#{deadlineTime},#{curMaxTime}
)
</insert>
@@ -23,7 +23,7 @@
feeYear,t.fee_month,t.fee_month feeMonth,t.fee_id,t.fee_id feeId,t.config_id,t.config_id
configId,t.obj_id,t.obj_id objId,t.fee_name,t.fee_name feeName,t.owe_amount,t.owe_amount
oweAmount,t.community_id,t.community_id communityId,t.fee_create_time,t.fee_create_time
- feeCreateTime,t.obj_type,t.obj_type objType
+ feeCreateTime,t.obj_type,t.obj_type objType,t.cur_max_time curMaxTime
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
where 1 =1
@@ -92,11 +92,8 @@
<if test="statisticsId !=null and statisticsId != ''">
and t.statistics_id= #{statisticsId}
</if>
- <if test="feeYear !=null ">
- and t.fee_year <= #{feeYear}
- </if>
- <if test="feeMonth !=null ">
- and t.fee_month <= #{feeMonth}
+ <if test="curMaxTime !=null ">
+ and t.cur_max_time <= #{curMaxTime}
</if>
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
@@ -912,26 +909,27 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryPayFeeDetail" parameterType="Map" resultType="Map">
-
select pfc.fee_name feeName,f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,oc.car_num carNum,
pf.payer_obj_type payerObjType,t.start_time startTime,t.end_time endTime,t.create_time createTime,
t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfa.`value`
importFeeName,t.prime_rate,d.name primeRate,fdr.discount_small_type discountSmallType,fdr.rule_name
- ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName
+ ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,cb.o_id oId
from pay_fee_detail t
INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
left join pay_fee_attrs pfo on t.fee_id = pfo.fee_id and pfo.spec_cd = '390008'
left join pay_fee_detail_discount pfdd on t.detail_id = pfdd.detail_id and pfdd.status_cd = '0'
left join fee_discount fd on pfdd.discount_id = fd.discount_id and fd.status_cd = '0'
left join fee_discount_rule fdr on fd.rule_id = fdr.rule_id and fdr.status_cd = '0'
- left join t_dict d on t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and d.table_columns="prime_rate"
+ left join t_dict d on t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and
+ d.table_columns="prime_rate"
LEFT JOIN contract co on pf.payer_obj_id = co.contract_id and co.status_cd = '0' and pf.payer_obj_type='7777'
+ LEFT JOIN c_business cb on t.b_id = cb.b_id
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -989,7 +987,7 @@
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
@@ -1049,7 +1047,7 @@
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
left join pay_fee_detail_discount pfdd on t.detail_id = pfdd.detail_id and pfdd.status_cd = '0'
left join fee_discount fd on pfdd.discount_id = fd.discount_id and fd.status_cd = '0'
@@ -1231,7 +1229,8 @@
left join building_room br on t.payer_obj_id = br.room_id and t.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
- left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and
+ oc.car_type_cd='1001'
where t.state = '2008001'
and t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
@@ -1255,7 +1254,8 @@
left join building_room br on t.payer_obj_id = br.room_id and t.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
- left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and
+ oc.car_type_cd='1001'
where t.state = '2008001'
and t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
@@ -1470,7 +1470,7 @@
<select id="getRepairWithOutPage" parameterType="Map" resultType="Map">
select r.staff_id staffId,r.staff_name staffName,r.state, t.name stateName, count(*) amount from r_repair_user r
left join t_dict t on t.table_name="r_repair_user" and t.table_columns="state" and t.status_cd=r.state
- where r.state != "10005" and r.status_cd = "0"
+ where r.state != '10005' and r.status_cd = '0'
<if test="ruId != null and ruId != ''">
and r.ru_id = #{ruId}
</if>
@@ -1524,9 +1524,10 @@
</select>
<select id="queryRepairForStaff" parameterType="Map" resultType="Map">
- SELECT r.staff_id staffId,r.staff_name staffName FROM r_repair_user r
- WHERE r.state!='10005' AND
- r.repair_event!='payUser' AND r.repair_event!="startUser" AND r.staff_id != '-1'
+ SELECT r.staff_id staffId,r.staff_name staffName,r.state FROM r_repair_user r
+ WHERE r.state!='10005' AND r.state!='10009' AND r.state!='11000' AND
+ r.state!='12000' AND r.state != '10007' AND r.status_cd = '0' AND
+ r.repair_event != 'payUser' AND r.repair_event != 'startUser' AND r.staff_id != '-1'
<if test="communityId != null and communityId !=''">
and r.community_id = #{communityId}
</if>
@@ -1583,9 +1584,10 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryNoFeeRooms" parameterType="Map" resultType="Map">
- select f.floor_num floorNum,bu.unit_num unitNum,t.room_num roomNum,t.room_id roomId,bo.owner_id ownerId,bo.name ownerName,bo.link
+ select f.floor_num floorNum,bu.unit_num unitNum,t.room_num roomNum,t.room_id roomId,bo.owner_id ownerId,bo.name
+ ownerName,bo.link
from building_room t
- inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+ inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
left join building_owner_room_rel borr on borr.room_id = t.room_id and borr.status_cd ='0'
left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
--
Gitblit v1.8.0