1.增加账龄分析导出明细接口修改

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/AgingAnalysisRDItem.java

@@ -74,7 +74,10 @@ public class AgingAnalysisRDItem {
 	@ExcelProperty(value = "150")
 	private BigDecimal day150;
 
-	@ExcelProperty(value = "150")
+	@ExcelProperty(value = "over150")
 	private BigDecimal dayOver150;
 
+	@ExcelProperty(value = "合计")
+	private BigDecimal total;
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -1001,12 +1001,13 @@
                 lfc. branch_name AS branchName,
             </otherwise>
         </choose>
-        CASE WHEN DC=#{fee.dc} and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 1 MONTH) then lfc.amount-lfc.stl_amount else 0 END AS day30,
-        CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 1 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 2 MONTH) then lfc.amount-lfc.stl_amount else 0 END AS day60,
-        CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 2 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 3 MONTH) then lfc.amount-lfc.stl_amount else 0 END AS day90,
-        CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 3 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 4 MONTH) then lfc.amount-lfc.stl_amount else 0 END AS day120,
-        CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 4 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 5 MONTH) then lfc.amount-lfc.stl_amount else 0 END AS day150,
-        CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 5 MONTH) then lfc.amount-lfc.stl_amount else 0 END AS dayOver150,
+        SUM(CASE WHEN DC=#{fee.dc} and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 1 MONTH) then lfc.amount-lfc.stl_amount else 0 END) AS day30,
+        SUM(CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 1 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 2 MONTH) then lfc.amount-lfc.stl_amount else 0 END) AS day60,
+        SUM(CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 2 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 3 MONTH) then lfc.amount-lfc.stl_amount else 0 END) AS day90,
+        SUM(CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 3 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 4 MONTH) then lfc.amount-lfc.stl_amount else 0 END) AS day120,
+        SUM(CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 4 MONTH) and lfc.bill_date >= DATE_SUB(#{fee.etdEnd}, INTERVAL 5 MONTH) then lfc.amount-lfc.stl_amount else 0 END) AS day150,
+        SUM(CASE WHEN DC=#{fee.dc} and lfc.bill_date &lt; DATE_SUB(#{fee.etdEnd}, INTERVAL 5 MONTH) then lfc.amount-lfc.stl_amount else 0 END) AS dayOver150,
+        SUM(CASE WHEN DC=#{fee.dc} then amount-stl_amount else 0 END) AS total,
         lsb.actual_etd AS atd,
         lsb.actual_eta AS ata,
         lsb.mblno AS mblno,
@@ -1035,6 +1036,8 @@
         <if test='fee.corpId != null and fee.corpId != ""'>
             AND lfc.corp_id = #{fee.corpId}
         </if>
+        GROUP BY lfc.branch_name,lfc.corp_cn_name,lsb.mblno,lsb.hblno,lsb.booking_agent_cn_name
+        ORDER BY lfc.branch_name,lfc.corp_cn_name,lsb.actual_etd
     </select>
 
 </mapper>