优化停车

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

@@ -1274,7 +1274,7 @@
     <select id="getMonthReceivedDetailInfo" parameterType="Map" resultType="Map">
         select concat(f.floor_num,'-',bu.unit_num,'-',br.room_num) objName,t.owner_name ownerName,t.link,t.fee_name feeName, pfd.start_time startTime,pfd.end_time endTime,
         pfd.pay_order_id payOrderId,pfd.cashier_name cashierName,
-        t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfd.create_time createTime
+        t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfd.create_time createTime,concat(t.detail_year,'-',t.detail_month) curYearMonth
         from pay_fee_detail_month t
         inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
         left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0'
@@ -1304,6 +1304,7 @@
         <if test="link != null and link != ''">
             and t.link = #{link}
         </if>
+        order by t.obj_name,t.fee_name,t.detail_year,t.detail_month
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -1377,7 +1378,7 @@
     <!-- 月实收 查询-->
     <select id="getMonthOweDetailInfo" parameterType="Map" resultType="Map">
         select concat(f.floor_num,'-',bu.unit_num,'-',br.room_num) objName,t.owner_name ownerName,t.link,t.fee_name feeName, pf.end_time startTime,t.deadline_time endTime,
-        t.receivable_amount receivableAmount,t.received_amount receivedAmount
+        t.receivable_amount receivableAmount,t.received_amount receivedAmount,concat(t.detail_year,'-',t.detail_month) curYearMonth
         from pay_fee_detail_month t
         inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
         left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0'
@@ -1406,6 +1407,7 @@
         <if test="link != null and link != ''">
             and t.link = #{link}
         </if>
+        order by t.obj_name,t.fee_name,t.detail_year,t.detail_month
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

service-job/src/main/java/com/java110/job/export/adapt/DataMonthOweStatisticsAdapt.java

@@ -99,7 +99,8 @@ public class DataMonthOweStatisticsAdapt implements IExportDataAdapt {
             row.createCell(0).setCellValue(getValue(dataObj, "objName"));
             row.createCell(1).setCellValue(getValue(dataObj, "ownerName") + "(" + getValue(dataObj, "link") + ")");
             row.createCell(2).setCellValue(getValue(dataObj, "feeName"));
-            row.createCell(3).setCellValue(getValue(dataObj, "startTime") + "~" + getValue(dataObj, "endTime"));
+            //row.createCell(3).setCellValue(getValue(dataObj, "startTime") + "~" + getValue(dataObj, "endTime"));
+            row.createCell(3).setCellValue(getValue(dataObj, "curYearMonth"));
             row.createCell(4).setCellValue(getValue(dataObj, "receivableAmount"));
         }
 

service-job/src/main/java/com/java110/job/export/adapt/DataMonthReceivedStatisticsAdapt.java

@@ -107,7 +107,8 @@ public class DataMonthReceivedStatisticsAdapt implements IExportDataAdapt {
             row.createCell(1).setCellValue(getValue(dataObj, "ownerName") + "(" + getValue(dataObj, "link") + ")");
             row.createCell(2).setCellValue(getValue(dataObj, "receivedAmount"));
             row.createCell(3).setCellValue(getValue(dataObj, "feeName"));
-            row.createCell(4).setCellValue(getValue(dataObj, "startTime") + "~" + getValue(dataObj, "endTime"));
+            //row.createCell(4).setCellValue(getValue(dataObj, "startTime") + "~" + getValue(dataObj, "endTime"));
+            row.createCell(4).setCellValue(getValue(dataObj, "curYearMonth"));
             row.createCell(5).setCellValue(getValue(dataObj, "cashierName"));
             row.createCell(5).setCellValue(getValue(dataObj, "createTime"));
         }

service-report/src/main/java/com/java110/report/cmd/dataReport/QueryMonthOweDetailCmd.java

@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 查询月实收明细统计
+ * 查询月欠费明细
  */
 @Java110Cmd(serviceCode = "dataReport.queryMonthOweDetail")
 public class QueryMonthOweDetailCmd extends Cmd {