From 9541f09909bd6db68b790b89db8d171e8e99d5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=8E?= <125556714+Topfunplus@users.noreply.github.com> Date: Fri, 6 Jun 2025 17:54:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E7=A5=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 增加 pageNum 参数获取 - 修改发票查询条件判断逻辑,支持发票号码查询- 添加分页筛选功能,根据 pageNum 和 pageSize 对查询结果进行分页 --- .../ivsale/application/action/ApplicationQryAction.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sscivm/src/client/nccloud/web/sscivm/ivsale/application/action/ApplicationQryAction.java b/sscivm/src/client/nccloud/web/sscivm/ivsale/application/action/ApplicationQryAction.java index ce61806..76cca3b 100644 --- a/sscivm/src/client/nccloud/web/sscivm/ivsale/application/action/ApplicationQryAction.java +++ b/sscivm/src/client/nccloud/web/sscivm/ivsale/application/action/ApplicationQryAction.java @@ -66,6 +66,7 @@ public class ApplicationQryAction implements ICommonAction { IQueryScheme scheme = ncCloudQueryService.convertCondition(info); Map> pkAndTsList = queryService.queryApplicationPksBySchema(scheme, appcode, sgbzflag); String pageSize = (String) pageInfo.get("pageSize"); + String pageNum = (String) pageInfo.get("pageIndex"); // õallApplicationVOListеPK,ԼѯеFPHM ٲѯһݿ boolean isSpcialQuery = false; QuerySchemeProcessor processor = new QuerySchemeProcessor(scheme); @@ -95,7 +96,7 @@ public class ApplicationQryAction implements ICommonAction { filteredPks = ivApplicationHeadVOS.toArray(new String[0]); } // д˷Ʊ ִд߼ - if (invoiceDate != null && invoiceDate.length > 0) { + if (invoiceDate != null && invoiceDate.length > 0 || invoiceNums != null && invoiceNums.length > 0) { List ivApplogVOS = queryService.queryByInvoiceNumberAndAggPK(filteredPks, invoiceDate, invoiceNums); // allApplicationAggVOList ivApplogVOSÿһlyidǷ allApplicationAggVOList = allApplicationAggVOList.stream() @@ -103,9 +104,14 @@ public class ApplicationQryAction implements ICommonAction { .anyMatch(logVO -> logVO.getLyid().equals(aggVO.getPk_ivapplication()))) .collect(Collectors.toList()); } + // ҳPKS filteredPks = allApplicationAggVOList.stream() .map(IVApplicationHeadVO::getPk_ivapplication) .collect(Collectors.toList()).toArray(new String[0]); + // ҳɸѡ + int subIndex = Math.min(allApplicationAggVOList.size(), Integer.parseInt(pageNum + 1) * Integer.parseInt(pageSize)); + allApplicationAggVOList = allApplicationAggVOList + .subList(Integer.parseInt(pageNum), subIndex); } if (allApplicationAggVOList != null && allApplicationAggVOList.size() > 0) { invApplication = operator.toGrid(allApplicationAggVOList.toArray(new IVApplicationHeadVO[allApplicationAggVOList.size()]));