From af32f0e46e90b874f60b406000875d8a27d4848c Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Mon, 24 Mar 2025 17:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E8=B4=A6=E7=9B=B8=E5=AF=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountBalanceTotalQueryAction.java       | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 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 d643178..de8256c 100644
--- a/gl/src/client/nccloud/web/gl/accountrep/action/AccountBalanceTotalQueryAction.java
+++ b/gl/src/client/nccloud/web/gl/accountrep/action/AccountBalanceTotalQueryAction.java
@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSONArray;
 import nc.bs.logging.Logger;
 import nc.vo.pub.BusinessException;
 import nccloud.framework.core.exception.ExceptionUtils;
@@ -133,12 +134,12 @@ public class AccountBalanceTotalQueryAction implements ICommonAction {
             }
         }
         mergedList.removeAll(toBeRemoved);
-        for (int i = 1; i < mergedList.size(); i++) {
-            mergedList.get(i).put("pacccode", "");
-            mergedList.get(i).put("paccname", "");
-            mergedList.get(i).put("pendlocamount", "");
-            mergedList.get(i).put("difference", "");
-        }
+//        for (int i = 1; i < mergedList.size(); i++) {
+//            mergedList.get(i).put("pacccode", "");
+//            mergedList.get(i).put("paccname", "");
+//            mergedList.get(i).put("pendlocamount", "");
+//            mergedList.get(i).put("difference", "");
+//        }
         //{"busiParamJson":"{\"pk_accountingbook\":[\"1001A110000000001PFH\"],\"pk_unit\":[],\"multbusi\":false,\"usesubjversion\":\"N\",\"versiondate\":\"2025-01-02\",\"startlvl\":\"1\",\"endlvl\":\"1\",\"isleave\":true,\"isoutacc\":\"N\",\"startyear\":\"2024\",\"endyear\":\"2024\",\"startperiod\":\"12\",\"endperiod\":\"12\",\"startdate\":\"2024-12-01\",\"endtdate\":\"2024-12-31\",\"includeuntally\":\"N\",\"includeerror\":\"N\",\"includeplcf\":\"Y\",\"includerc\":\"N\",\"pk_currtype\":\"本币\",\"returncurr\":\"1\",\"mutibook\":\"N\",\"showzerooccur\":\"N\",\"showzerobalanceoccur\":\"Y\",\"sumbysubjtype\":\"N\",\"showupsubj\":\"N\",\"currplusacc\":\"Y\",\"balanceori\":\"-1\",\"twowaybalance\":\"N\",\"istree\":\"Y\",\"qryObjs\":[],\"pk_accasoa\":[\"1001A1100000000017SV\"]}","sysParamJson":{"busiaction":"科目辅助余额表-查询","appcode":"20028003","tabid":"","ts":1735815136860,"from":"","pagecs":1735804016325}}
 
         // 输出合并后的列表
@@ -216,7 +217,13 @@ public class AccountBalanceTotalQueryAction implements ICommonAction {
         firstBusiParamJson.put("istree", "Y");
         firstBusiParamJson.put("qryObjs", new ArrayList<String>(){});
         firstBusiParamJson.put("pk_accasoa", pkAccasoa);
+        if(pkAccasoa.isEmpty() || pkAccasoa.get(0).equals("")){
+            firstBusiParamJson.put("isleave", "N");
+            firstBusiParamJson.put("pk_accasoa", new ArrayList<String>(){});
+        }else{
+            firstBusiParamJson.put("isleave", null);
 
+        }
 //        firstBusiParamJson.put("pk_accasoa", pkAccasoa);//1001A1100000000017SV
 
         Map<String, Object> firstSysParamJson = new HashMap<>();
@@ -230,7 +237,7 @@ public class AccountBalanceTotalQueryAction implements ICommonAction {
         // 创建第二个 Map 对象
         Map<String, Object> secondBusiParamJson = new HashMap<>();
         secondBusiParamJson.put("pk_accountingbook", pkAccountingBook);
-        secondBusiParamJson.put("pk_unit", new ArrayList<String>(){});
+        secondBusiParamJson.put("pk_unit",new ArrayList<String>());
         secondBusiParamJson.put("multbusi", false);
         secondBusiParamJson.put("usesubjversion", "N");
         secondBusiParamJson.put("versiondate", null);
@@ -243,7 +250,8 @@ public class AccountBalanceTotalQueryAction implements ICommonAction {
         secondBusiParamJson.put("startperiod", startPeriod);
         secondBusiParamJson.put("endperiod", endPeriod);
         secondBusiParamJson.put("startdate", startDate);
-        secondBusiParamJson.put("endtdate", endDate);
+//        secondBusiParamJson.put("endtdate", endDate);
+        secondBusiParamJson.put("enddate", endDate);
         secondBusiParamJson.put("includeuntally", "N");
         secondBusiParamJson.put("includeerror", "N");
         secondBusiParamJson.put("includeplcf", "Y");
@@ -258,9 +266,15 @@ public class AccountBalanceTotalQueryAction implements ICommonAction {
         secondBusiParamJson.put("balanceori", "-1");
         secondBusiParamJson.put("twowaybalance", "N");
         secondBusiParamJson.put("querybyperiod", true);
-//        secondBusiParamJson.put("pk_accasoa", new ArrayList<String>(){});
         secondBusiParamJson.put("pk_accasoa", pkAccasoa);//1001A1100000000017SV
+        if(pkAccasoa.isEmpty() || pkAccasoa.get(0).equals("")){
+            secondBusiParamJson.put("isleave", "N");
+            secondBusiParamJson.put("pk_accasoa", new ArrayList<String>(){});
+        }else{
+            secondBusiParamJson.put("isleave", null);
 
+        }
+        secondBusiParamJson.put("appcode", "20023005");
         Map<String, Object> secondSysParamJson = new HashMap<>();
         secondSysParamJson.put("busiaction", "科目余额表-查询");
         secondSysParamJson.put("appcode", "20023005");