客户收支表更新

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -3123,7 +3123,7 @@
         SELECT
             tpo.cus_id as "objectId"
              , tpo.order_no as "biznisNo"
-             , tpo.make_time as "accDate"
+             , tpo.make_time::date as "accDate"
              , COALESCE(SUM(tpo.fact_amt), 0) as "facAmt"
         FROM dkic_b.t_psi_order tpo
         WHERE tpo.flg_valid
@@ -3161,33 +3161,33 @@
     <!--获取销售额-->
     <select id="getSales" resultType="java.util.Map">
         SELECT
-        SUM(COALESCE(tpo.fact_amt, 0)) as "facAmt"
+            COALESCE(SUM(tpo.fact_amt), 0) as "facAmt"
         FROM dkic_b.t_psi_order tpo
         WHERE tpo.flg_valid
         AND tpo.cp_id = #{cpId}
-        AND tpo.make_time &lt; CURRENT_DATE
+        AND tpo.make_time::date &lt;= CURRENT_DATE
     </select>
     <!--获取收支额-->
     <select id="getIncomeExpenditure" resultType="java.util.Map">
         SELECT
-        SUM(COALESCE(a.amt_rec, 0)) as "arrears"
+            COALESCE(SUM(a.amt_rec), 0) as "arrears"
         FROM dkic_b.t_mac_account_item a
         LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = a.object_id
         WHERE a.flg_valid
         AND a.cp_id = #{cpId}
         AND tmc.cus_name IS NOT NULL AND tmc.cus_name != ''
-        AND a.make_time &lt; CURRENT_DATE
+        AND a.make_time::date &lt;= CURRENT_DATE
     </select>
     <!--获取欠款额-->
     <select id="getDebt" resultType="java.util.Map">
         SELECT
-        SUM(COALESCE(tpo.out_amt, 0)) as "outAmt"
+            COALESCE(SUM(tpo.out_amt), 0) as "outAmt"
         FROM dkic_b.t_mac_account_item a
         LEFT JOIN dkic_b.t_psi_outbound tpo ON tpo.out_id = a.biznis_id
         WHERE a.flg_valid
         AND a.cp_id = #{cpId}
         AND tpo.out_amt &lt; 0
-        AND a.make_time &lt; CURRENT_DATE
+        AND a.make_time::date &lt;= CURRENT_DATE
     </select>
 
     <!--region 销售利润-->

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -775,8 +775,11 @@ public class ReportService {
             Map<String, Object> incomeExpenditure = reportMapper.getIncomeExpenditure(params);
             // 获取欠款额
             Map<String, Object> debt = reportMapper.getDebt(params);
-            debt.put("outAmt", Double.valueOf(String.valueOf(sales.get("facAmt")))
-                    + Double.valueOf(String.valueOf(debt.get("outAmt"))) - Double.valueOf(String.valueOf(incomeExpenditure.get("arrears"))));
+            if (debt != null) {
+                debt.put("outAmt", Double.valueOf(String.valueOf(sales.get("facAmt")).equals("null") ? "0" : String.valueOf(sales.get("facAmt")))
+                        + Double.valueOf(String.valueOf(debt.get("outAmt")).equals("null") ? "0" : String.valueOf(debt.get("outAmt")))
+                        - Double.valueOf(String.valueOf(incomeExpenditure.get("arrears")).equals("null") ? "0" : String.valueOf(incomeExpenditure.get("arrears"))));
+            }
             // todo
             List<Map<String, Object>> overviewList = new ArrayList<>();
             overviewList.add(sales);