From ce83a23f15682c70f9e46c8ca2cba451d1f1864c Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Wed, 6 Aug 2025 10:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92-=E5=80=9F?=
 =?UTF-8?q?=E6=96=99=E5=85=A5=E5=BA=93=E5=BC=B9=E7=AA=97-=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2-=E8=BF=94=E5=9B=9E=E5=80=BC?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/query/PickmByIdsQueryAction.java    | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 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 ba9c5d3..72c43c2 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java
@@ -1,12 +1,8 @@
 package nccloud.web.mmpac.pickm.query;
 
 import nc.itf.mmpac.pickm.IPickmQueryService;
-import nc.util.mmf.framework.base.MMValueCheck;
 import nc.vo.ml.NCLangRes4VoTransl;
 import nc.vo.mmpac.pickm.entity.AggPickmVO;
-import nc.vo.mmpac.pickm.entity.PickmHeadVO;
-import nc.vo.mmpac.pickm.entity.PickmItemVO;
-import nc.vo.mmpac.pickm.util.PickmSortUtil;
 import nccloud.dto.mmpac.pickm.pub.entity.PickmQueryInfoDTO;
 import nccloud.framework.core.exception.ExceptionUtils;
 import nccloud.framework.core.json.IJson;
@@ -14,6 +10,9 @@ 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.pattern.billcard.BillCard;
+import nccloud.framework.web.ui.pattern.billcard.BillCardOperator;
+import nccloud.framework.web.ui.pattern.grid.Grid;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,24 +31,21 @@ public class PickmByIdsQueryAction implements ICommonAction {
         IJson json = JsonFactory.create();
         PickmQueryInfoDTO query = json.fromJson(read, PickmQueryInfoDTO.class);
         try {
+            String pageid = query.getPageid();
             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<PickmItemVO> pickmItemVOList =new ArrayList<>();
+            List<Grid> bodyList = new ArrayList<>();
             for (AggPickmVO vo : vos) {
-                PickmHeadVO headVO= vo.getParentVO();
-                PickmItemVO[] childrenVO = (PickmItemVO[]) vo.getChildrenVO();
-                for (PickmItemVO child : childrenVO) {
-
-                    pickmItemVOList.add(child);
-                }
-
+                BillCardOperator operator = new BillCardOperator(pageid);
+                BillCard billCard = operator.toCard(vo);
+                bodyList.add(billCard.getBody());
             }
             Map<String, Object> returnMap = new HashMap<>();
-            returnMap.put("data", pickmItemVOList);
+            returnMap.put("data", bodyList);
             returnMap.put("success", true);
             return returnMap;
         } catch (Exception ex) {