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 pickmItemVOList =new ArrayList<>(); + List 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 returnMap = new HashMap<>(); - returnMap.put("data", pickmItemVOList); + returnMap.put("data", bodyList); returnMap.put("success", true); return returnMap; } catch (Exception ex) {