From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug

---
 java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 520e939..9dc8aad 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -692,7 +692,7 @@
             and pfc.start_time &lt;= #{endTime}
         </if>
         <if test="yearMonth !=null and yearMonth != ''">
-            and concat(t.fee_year,t.fee_month) = #{yearMonth}
+            and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
         </if>
 
         group by t.config_id,t.fee_name,pfc.start_time
@@ -762,7 +762,7 @@
             and pfc.start_time &lt;= #{endTime}
         </if>
         <if test="yearMonth !=null and yearMonth != ''">
-            and concat(t.fee_year,t.fee_month) = #{yearMonth}
+            and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
         </if>
         group by t.config_id,t.fee_name,pfc.start_time
         order by t.create_time desc
@@ -831,7 +831,7 @@
             and pfc.start_time &lt;= #{endTime}
         </if>
         <if test="yearMonth !=null and yearMonth != ''">
-            and concat(t.fee_year,t.fee_month) = #{yearMonth}
+            and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
         </if>
         order by t.create_time desc
     </select>
@@ -908,7 +908,6 @@
         inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
         left join pay_fee_attrs pfa on pf.fee_id = pfa.fee_id and pfa.spec_cd = '390008' and pfa.status_cd ='0'
         where t.status_cd = '0'
-        group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,pfa.`value`,br.built_up_area
         <if test="roomNum !=null and roomNum != ''">
             and br.room_num= #{roomNum}
         </if>
@@ -949,6 +948,7 @@
             and t.create_time &lt;= #{endTime}
         </if>
         group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,pfa.`value`,br.built_up_area
+        order by pfa.`value`
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -1109,6 +1109,7 @@
         </if>
         group by t.fee_name,t.payer_obj_id,t.payer_obj_name,pfa.`value`,br.built_up_area
         HAVING oweAmount > 0
+        order by pfa.`value`
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -1942,7 +1943,7 @@
         select 1 from pay_fee pf where t.room_id = pf.payer_obj_id and pf.status_cd = '0' and pf.state = '2008001'
         )
         and t.community_id = #{communityId}
-        order by t.create_time desc
+        order by bo.name
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -2570,13 +2571,13 @@
         and t.create_time &lt; #{endTime}
         and t.fee_id = #{feeId}
         <if test="flag == 1">
-            and concat(t.detail_year,t.detail_month) = #{yearMonth}
+            and concat(t.detail_year,lpad(t.detail_month,2,0)) = #{yearMonth}
         </if>
         <if test="flag == 2">
-            and concat(t.detail_year,t.detail_month) &lt; #{yearMonth}
+            and concat(t.detail_year,lpad(t.detail_month,2,0)) &lt; #{yearMonth}
         </if>
         <if test="flag == 3">
-            and concat(t.detail_year,t.detail_month) &gt; #{yearMonth}
+            and concat(t.detail_year,lpad(t.detail_month,2,0)) &gt; #{yearMonth}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}

--
Gitblit v1.8.0