楚江erp：台账报表总欠款逻辑处理

@@ -573,10 +573,24 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                     waitDeliveredOrderTotal += count;
                     waitDeliveredOrderTotal += count;
                     reportDetail.setWaitDeliveredOrder(count);
                     reportDetail.setWaitDeliveredOrder(count);
                 }
                 }
+                // 计算总欠款
+                BigDecimal debtTotal = reportDetail.getDebtTotal();
+                if (debtTotal == null) {
+                    debtTotal = BigDecimal.ZERO;
+                }
+                debtTotal = debtTotal.add(debtAmount);
+                reportDetail.setDebtTotal(debtTotal);
 
 
                 reportDetailMap.put(reportDetail.getCustomerName(), reportDetail);
                 reportDetailMap.put(reportDetail.getCustomerName(), reportDetail);
             }
             }
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
+            if (CollectionUtils.isNotEmpty(details)) {
+                // 转换成万元
+                for (ReceiptLedgerReportDetail detail : details) {
+                    BigDecimal debtTotal = detail.getDebtTotal();
+                    detail.setDebtTotal(valueConvert(debtTotal));
+                }
+            }
             report.setDetailList(details);
             report.setDetailList(details);
 
 
             // 处理约定内、一次协调、二次协调、清欠小计数据
             // 处理约定内、一次协调、二次协调、清欠小计数据

@@ -283,7 +283,6 @@
                 </foreach>
                 </foreach>
             </if>
             </if>
         </where>
         </where>
-        and tb.debt_status is not null
         group by c.name,cs.short_name,tb.debt_status
         group by c.name,cs.short_name,tb.debt_status
     </select>
     </select>