From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml
index 95d999b..6e1efb1 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml
@@ -32,11 +32,12 @@
         select t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time
         startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
         communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
-        pfd.remark,pf.fee_flag feeFlag
+        pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees
         from fee_receipt_detail t
         left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id =
         pfd.community_id
         left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and t.community_id = pf.community_id
+        LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and t.community_id = mw.community_id
         where 1 =1
 
         <if test="area !=null and area != ''">
@@ -50,6 +51,12 @@
         </if>
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}
+        </if>
+        <if test="detailIds !=null ">
+            and t.detail_id in
+            <foreach collection="detailIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="startTime !=null and startTime != ''">
             and t.start_time= #{startTime}
@@ -82,6 +89,7 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
+
 
     </select>
 
@@ -164,6 +172,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="detailIds !=null">
+            and t.detail_id in
+            <foreach collection="detailIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>

--
Gitblit v1.8.0