From 32fab2228763f8438fd898f9257da4510a83a97c Mon Sep 17 00:00:00 2001 From: lihao Date: Wed, 6 Aug 2025 11:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pickm/query/PickmByIdsQueryAction.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java index 72c43c2..bd2ae97 100644 --- a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java +++ b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java @@ -10,6 +10,7 @@ import nccloud.framework.service.ServiceLocator; import nccloud.framework.web.action.itf.ICommonAction; import nccloud.framework.web.container.IRequest; import nccloud.framework.web.json.JsonFactory; +import nccloud.framework.web.ui.model.row.Row; import nccloud.framework.web.ui.pattern.billcard.BillCard; import nccloud.framework.web.ui.pattern.billcard.BillCardOperator; import nccloud.framework.web.ui.pattern.grid.Grid; @@ -31,21 +32,25 @@ public class PickmByIdsQueryAction implements ICommonAction { IJson json = JsonFactory.create(); PickmQueryInfoDTO query = json.fromJson(read, PickmQueryInfoDTO.class); try { - String pageid = query.getPageid(); + String pageid ="50080102_card"; String[] pks = query.getPks(); IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class); AggPickmVO[] vos = service.queryBillsByPks(pks); if (null == vos || vos.length == 0) { ExceptionUtils.wrapBusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("5008100_0", "05008100-0005")); } + List list=new ArrayList<>(); List bodyList = new ArrayList<>(); for (AggPickmVO vo : vos) { - BillCardOperator operator = new BillCardOperator(pageid); - BillCard billCard = operator.toCard(vo); - bodyList.add(billCard.getBody()); + if(vo.getParentVO().getFbillstatus()!=-1){ + BillCardOperator operator = new BillCardOperator(pageid); + BillCard billCard = operator.toCard(vo); +// bodyList.add(billCard.getBody()); + list.addAll(List.of(billCard.getBody().getModel().getRows())); + } } Map returnMap = new HashMap<>(); - returnMap.put("data", bodyList); + returnMap.put("data", list); returnMap.put("success", true); return returnMap; } catch (Exception ex) {