楚江erp：台账报表金额转换成万元

@@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.*;
@@ -409,6 +410,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         if (CollectionUtils.isEmpty(debtAmountList)) {
         if (CollectionUtils.isEmpty(debtAmountList)) {
             return result;
             return result;
         }
         }
+        List<String> customerNameList = new ArrayList<>();
         // 根据简称分组
         // 根据简称分组
         Map<String, List<Map<String, Object>>> debtMap = new HashMap<>();
         Map<String, List<Map<String, Object>>> debtMap = new HashMap<>();
         for (Map<String, Object> map : debtAmountList) {
         for (Map<String, Object> map : debtAmountList) {
@@ -440,16 +442,16 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 }
                 }
                 reportDetail.setCustomerName(customerName);
                 reportDetail.setCustomerName(customerName);
                 if ("AGREEMENT".equals(debtStatus)) {
                 if ("AGREEMENT".equals(debtStatus)) {
-                    reportDetail.setAgreement(debtAmount);
+                    reportDetail.setAgreement(valueConvert(debtAmount));
                     agreementTotal = agreementTotal.add(debtAmount);
                     agreementTotal = agreementTotal.add(debtAmount);
                 } else if ("FIRST_COORDINATE".equals(debtStatus)) {
                 } else if ("FIRST_COORDINATE".equals(debtStatus)) {
-                    reportDetail.setFirstCoordinate(debtAmount);
+                    reportDetail.setFirstCoordinate(valueConvert(debtAmount));
                     firstCoordinateTotal = firstCoordinateTotal.add(debtAmount);
                     firstCoordinateTotal = firstCoordinateTotal.add(debtAmount);
                 } else if ("SECOND_COORDINATE".equals(debtStatus)) {
                 } else if ("SECOND_COORDINATE".equals(debtStatus)) {
-                    reportDetail.setSecondCoordinate(debtAmount);
+                    reportDetail.setSecondCoordinate(valueConvert(debtAmount));
                     secondCoordinateTotal = secondCoordinateTotal.add(debtAmount);
                     secondCoordinateTotal = secondCoordinateTotal.add(debtAmount);
                 } else if ("CLEAR_DEBTS".equals(debtStatus)) {
                 } else if ("CLEAR_DEBTS".equals(debtStatus)) {
-                    reportDetail.setClearDebt(debtAmount);
+                    reportDetail.setClearDebt(valueConvert(debtAmount));
                     clearDebtTotal = clearDebtTotal.add(debtAmount);
                     clearDebtTotal = clearDebtTotal.add(debtAmount);
                 }
                 }
                 debtTotal = debtTotal.add(debtAmount);
                 debtTotal = debtTotal.add(debtAmount);
@@ -457,17 +459,13 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 reportDetailMap.put(reportDetail.getCustomerName(), reportDetail);
                 reportDetailMap.put(reportDetail.getCustomerName(), reportDetail);
             }
             }
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
-            for (ReceiptLedgerReportDetail detail : details) {
-                BigDecimal total = getDebtTotal(detail);
-                detail.setDebtTotal(total);
-            }
             report.setDetailList(details);
             report.setDetailList(details);
 
 
-            report.setDebtTotal(debtTotal);
-            report.setAgreementTotal(agreementTotal);
-            report.setFirstCoordinateTotal(firstCoordinateTotal);
-            report.setSecondCoordinateTotal(secondCoordinateTotal);
-            report.setClearDebtTotal(clearDebtTotal);
+            report.setDebtTotal(valueConvert(debtTotal));
+            report.setAgreementTotal(valueConvert(agreementTotal));
+            report.setFirstCoordinateTotal(valueConvert(firstCoordinateTotal));
+            report.setSecondCoordinateTotal(valueConvert(secondCoordinateTotal));
+            report.setClearDebtTotal(valueConvert(clearDebtTotal));
             report.setWaitDeliveredOrderTotal(waitDeliveredOrderTotal);
             report.setWaitDeliveredOrderTotal(waitDeliveredOrderTotal);
         }
         }
         return result;
         return result;
@@ -522,4 +520,21 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             throw new DefaultClientException("日期数据异常！");
             throw new DefaultClientException("日期数据异常！");
         }
         }
     }
     }
+
+
+    /**
+     * 转换成万元
+     *
+     */
+    private BigDecimal valueConvert(BigDecimal targetValue) {
+        if (targetValue == null || targetValue.compareTo(BigDecimal.ZERO) == 0) {
+            return targetValue;
+        }
+        targetValue = targetValue.divide(BigDecimal.valueOf(10000), 6, RoundingMode.HALF_UP);
+        targetValue = targetValue.stripTrailingZeros();
+        if (targetValue.toString().contains("E")) {
+            targetValue = new BigDecimal(targetValue.toPlainString());
+        }
+        return targetValue;
+    }
 }
 }

@@ -203,7 +203,12 @@
 
 
     <select id="report" resultType="com.lframework.xingyun.sc.bo.ledger.receipt.ReceiptLedgerReportBo">
     <select id="report" resultType="com.lframework.xingyun.sc.bo.ledger.receipt.ReceiptLedgerReportBo">
         select tb.short_name as customer_short_name,
         select tb.short_name as customer_short_name,
-               tb.type,
+               case
+               when tb.type = 'DEALER' then '经销商'
+               when tb.type = 'TERMINAL' then '终端'
+               when tb.type = 'FOREIGN' then '外贸'
+               else tb.type
+               end as customer_type,
                tb.dept_id,
                tb.dept_id,
                d.name as dept_name,
                d.name as dept_name,
                tb.region,
                tb.region,