优化账账相对问题

This commit is contained in:
lihao 2025-01-03 18:34:22 +08:00
parent 0a39995ce0
commit b5ba6250e4
1 changed files with 19 additions and 2 deletions

View File

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