yonyou
/
tkjt
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

账账相对优化查询

This commit is contained in:
lihao 2025-03-24 17:49:46 +08:00
parent bd4f714e3a
commit af32f0e46e
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gl/src/client/nccloud/web/gl/accountrep/action/AccountBalanceTotalQueryAction.java
View File

@ -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");