From b5ba6250e454f5601ee9dc19025562b9abef8b16 Mon Sep 17 00:00:00 2001
From: lihao <3139678155@qq.com>
Date: Fri, 3 Jan 2025 18:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E8=B4=A6=E7=9B=B8?=
 =?UTF-8?q?=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountBalanceTotalQueryAction.java       | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/gl/src/client/nccloud/web/gl/accountrep/action/AccountBalanceTotalQueryAction.java b/gl/src/client/nccloud/web/gl/accountrep/action/AccountBalanceTotalQueryAction.java
index c8f9577..d643178 100644
--- a/gl/src/client/nccloud/web/gl/accountrep/action/AccountBalanceTotalQueryAction.java
+++ b/gl/src/client/nccloud/web/gl/accountrep/action/AccountBalanceTotalQueryAction.java
@@ -1,6 +1,8 @@
 package nccloud.web.gl.accountrep.action;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -108,7 +110,15 @@ public class AccountBalanceTotalQueryAction implements ICommonAction {
 // 计算每个父级科目的 endlocamount 和所有关联 data1 中 endlocamount 的差值
         for (Map<String, Object> item : mergedList) {
             String parentAcccode = (String) item.get("pacccode");
-            BigDecimal endlocamount = (BigDecimal) item.get("pendlocamount");
+            BigDecimal endlocamount =BigDecimal.ZERO;
+            if( item.get("pendlocamount") instanceof String){
+                String endlocamountStr = (String) item.get("pendlocamount");
+                 endlocamount = parseEndlocamount(endlocamountStr);
+            }else if( item.get("pendlocamount") instanceof BigDecimal){
+                endlocamount = (BigDecimal) item.get("pendlocamount");
+            }
+
+//            BigDecimal endlocamount = (BigDecimal) item.get("pendlocamount");
             BigDecimal sumEndlocamount = sumMap.get(parentAcccode);
             BigDecimal difference = sumEndlocamount.subtract(endlocamount);
             if (difference.compareTo(BigDecimal.ZERO) == 0) {
@@ -171,7 +181,14 @@ public class AccountBalanceTotalQueryAction implements ICommonAction {
         firstBusiParamJson.put("pk_unit", new ArrayList<String>(){});
         firstBusiParamJson.put("multbusi", false);
         firstBusiParamJson.put("usesubjversion", "N");
-        firstBusiParamJson.put("versiondate", "2025-01-02");
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+// 格式化日期为 "yyyy-MM-dd" 格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String formattedDate = currentDate.format(formatter);
+
+// 设置 versiondate 为当前日期
+        firstBusiParamJson.put("versiondate", formattedDate);
         firstBusiParamJson.put("startlvl", "1");
         firstBusiParamJson.put("endlvl", "1");
         firstBusiParamJson.put("isleave", isleave);