From 2aab504a6629bd4b11223b12cd14e9733ec1e03d Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 22 Nov 2024 16:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A8=E5=BA=93=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=20=E8=B6=85=E6=97=B6=E5=AD=97=E6=AE=B5=20=E5=92=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E5=A2=9E=E5=8A=A0=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E5=8D=95=E8=B6=85=E6=97=B6=E5=AD=97=E6=AE=B5=E5=92=8C=E6=90=9C?= =?UTF-8?q?=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionStockArticleVO.java | 5 + .../com/logpm/trunkline/dto/AdvanceDTO.java | 4 + .../trunkline/vo/TrunklineAdvanceVO.java | 5 + .../DistributionStockArticleController.java | 13 +- .../dto/DistributionStockArticleOweDTO.java | 5 + .../DistributionStockArticleMapper.java | 2 + .../mapper/DistributionStockArticleMapper.xml | 161 ++++++++++++++++ .../IDistributionStockArticleService.java | 1 + .../DistributionStockArticleServiceImpl.java | 175 ++++++++++++------ .../DistributionStockArticleWrapper.java | 10 +- .../mapper/TrunklineAdvanceMapper.xml | 58 +++--- .../mapper/TrunklineCarsLoadMapper.xml | 1 + .../impl/TrunklineAdvanceServiceImpl.java | 15 -- 13 files changed, 340 insertions(+), 115 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index 2c80a7c28..f0cc8cdce 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -184,6 +184,11 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { private Integer unreceivedQuantity; + /** + * 是否超时 + */ + private Integer isTimeOut; + public Map toMap() throws IllegalAccessException { diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java index 45945d43f..c679eea76 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java @@ -53,4 +53,8 @@ public class AdvanceDTO implements Serializable { private Date startCreateTime; private Date endCreateTime; + private Integer isTimeOut; + + + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java index 92d913e89..2090c4733 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java @@ -16,4 +16,9 @@ public class TrunklineAdvanceVO extends TrunklineAdvanceEntity { private Integer isIncoming; + /** + * 是否超时 + */ + private Integer isTimeOut; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 326225df6..a408f6c31 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -79,14 +79,6 @@ public class DistributionStockArticleController extends BladeController { private final IDistributionStockArticleService distributionStockArticleService; - private IBasicdataWarehouseClient warehouseClient; - - private final IDictBizClient dictBizClient; - - private final IUserClient userClient; - -// private final IBasicdataWarehouseClient warehouseClient; - private final IBasicdataClientClient basicdataClientClient; private final IDistributionOrderCustomerLogService distributionOrderCustomerLogService; @@ -109,8 +101,9 @@ public class DistributionStockArticleController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") public R> list(@ApiIgnore @RequestParam Map distributionStockArticle, Query query) { - IPage pages = distributionStockArticleService.pageListOwe(Condition.getPage(query), distributionStockArticle); - return R.data(DistributionStockArticleWrapper.build().pageVO(pages)); +// IPage pages = distributionStockArticleService.pageListOwe(Condition.getPage(query), distributionStockArticle); + IPage pages = distributionStockArticleService.pageListOweNew(Condition.getPage(query), distributionStockArticle); + return R.data(pages); } @ResponseBody diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java index 9db7d959c..b43db5511 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java @@ -83,4 +83,9 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti @ApiModelProperty(value = "入库时间结束") private Date warehouseEntryTimeEnd; private List warehouseIdList; + + /** + * 是否超时 + */ + private Integer isTimeOut; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index f7f80973f..e90a4f8de 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -240,4 +240,6 @@ public interface DistributionStockArticleMapper extends BaseMapper findStockArticleIds(@Param("orderCodes") Set orderCodes); IPage selectClentAllDistributionOrder(IPage page,@Param("par") DistributionStockArticleOweDTO stockArticleEntity); + + IPage pageListOweNew(IPage page,@Param("param")DistributionStockArticleOweDTO stockArticleEntity,@Param("warehouseIds")List warehouseIds); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 9ead49dd1..1e28804f1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -2385,5 +2385,166 @@ ORDER BY ldsa.warehouse_entry_time DESC + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index 5635df08f..822b352ea 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -331,4 +331,5 @@ public interface IDistributionStockArticleService extends BaseService pageListOweNew(IPage page, Map distributionStockArticle); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index c3941c563..604001dc8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -116,34 +116,16 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl warehouseIdList = warehouseClient.getWarehouseIds(); @@ -1027,6 +1005,86 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl pageListOweNew(IPage page, Map distributionStockArticle) { + DistributionStockArticleOweDTO stockArticleEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockArticle), DistributionStockArticleOweDTO.class); + if (Func.isNotEmpty(distributionStockArticle.get("typeServer"))) { + stockArticleEntity.setTypeService((String) distributionStockArticle.get("typeServer")); + } + if (Func.isNotEmpty(stockArticleEntity.getOrderCodeNum())) { + String anumbering = stockArticleEntity.getOrderCodeNum().trim(); + List list = CommonUtil.stringNum(anumbering); + if (list.size() > 1) { + stockArticleEntity.setOrderCodeNumList(list); + } else { + stockArticleEntity.setOrderCodeNumLike(anumbering); + } + } + if (Func.isNotEmpty(stockArticleEntity.getWaybillNum())) { + String waybill = stockArticleEntity.getWaybillNum().trim(); + List list = CommonUtil.stringNum(waybill); + if (list.size() > 1) { + stockArticleEntity.setWaybillNumList(list); + } else { + stockArticleEntity.setWaybillNumLike(waybill); + } + } + if (ObjectUtil.isNotEmpty(stockArticleEntity.getIds())) { + String ids = stockArticleEntity.getIds().trim(); + List list = CommonUtil.stringNum(ids); + if (list.size() > 1) { + stockArticleEntity.setIdsList(list); + } else { + stockArticleEntity.setIdsLike(ids); + } + } + + List warehouseIdList = warehouseClient.getWarehouseIds(); + + IPage distributionStockArticleEntityIPage = baseMapper.pageListOweNew(page, stockArticleEntity, warehouseIdList); + + List records = distributionStockArticleEntityIPage.getRecords(); + records.forEach(record -> { + if (ObjectUtils.isNotNull(record.getWarehouseEntryTime())) { + long time1 = record.getWarehouseEntryTime().getTime(); //入库 + long time2 = System.currentTimeMillis(); // 现在 + int days = (int) ((time2 - time1) / (1000 * 60 * 60 * 24)); + if (days == 0) { + days = 1; + } + record.setStoreTime(days + "天"); + } + + if (ObjectUtils.isNotNull(record.getCompleteSet())) { + switch (record.getCompleteSet()) { + case 1: + record.setCompleteSetName("否"); + break; + case 2: + record.setCompleteSetName("是"); + break; + } + } + + record.setTypeServerName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, record.getTypeService())); + record.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, record.getOrderStatus())); + record.setGroundingStatusName(DictBizCache.getValue(DictBizConstant.BASIC_GROUNDING, record.getGroundingStatus())); + record.setFreezeStatusName(DictBizCache.getValue(DictBizConstant.FREEZE_STATUS, record.getFreezeStatus())); + record.setReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RESERVATION_STATUS, record.getReservationStatus())); + record.setStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_STOCKUP_STATUS, record.getStockupStatus())); + if (ObjectUtils.isNotNull(record.getCreateUser())) { + R userR = userClient.userInfoById(record.getCreateUser()); + if (userR.isSuccess() && userR.getData() != null) { + record.setCreateUserName(userR.getData().getName()); + } + } + record.setOrderReceiveStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RECEIVE_STATUS, record.getOrderReceiveStatus())); + }); + + + return distributionStockArticleEntityIPage; + } + @Override public R selectStockArticleInfoList(Map distributionStockArticle, Query query) { // IPage page = Condition.getPage(query); @@ -1237,12 +1295,12 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl { productsNumList.add(wayBillDetail.getProductName() + "（" + wayBillDetail.getNum() + "）"); }); - map.put("product", String.join(",",productsNumList)); + map.put("product", String.join(",", productsNumList)); data.add(map); } @@ -2638,7 +2696,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl { productsNumList.add(wayBillDetail.getProductName() + "（" + wayBillDetail.getNum() + "）"); }); - map.put("product", String.join(",",productsNumList)); + map.put("product", String.join(",", productsNumList)); map.put("remark", StringUtil.isBlank(remark) ? "" : remark); } @@ -2680,17 +2738,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(distributionStockupVO.getCreateUser()); - if(userR.isSuccess() && userR.getData()!=null){ + if (userR.isSuccess() && userR.getData() != null) { distributionStockupVO.setCreateUserName(userR.getData().getName()); } @@ -2813,7 +2871,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list = distributionParcelListService.list(queryWrapper); - Map map = new HashMap<>(); - map.put("orderInfo",stockArticle); - map.put("waybillEntity",waybillEntity); - map.put("parcelList",list); + Map map = new HashMap<>(); + map.put("orderInfo", stockArticle); + map.put("waybillEntity", waybillEntity); + map.put("parcelList", list); return R.data(map); } @@ -2847,47 +2904,47 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl warehouseIdList = new ArrayList<>(); - if (Objects.isNull(myCurrentWarehouse)){ + if (Objects.isNull(myCurrentWarehouse)) { //查询当前人的仓库列表 // List warehouseList = warehouseClient.getMyWarehouseList(); // if (!warehouseList.isEmpty()) { // warehouseIdList.addAll(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList())); // } return R.fail("多仓库权限人员请选择仓库后查看"); - }else { + } else { warehouseIdList.add(myCurrentWarehouse.getId()); } - if (warehouseIdList.isEmpty()){ + if (warehouseIdList.isEmpty()) { return R.fail("当前登录人仓库信息错误"); } - Map> info = new HashMap<>(); + Map> info = new HashMap<>(); //查询此暂存单数据在仓库的情况 List list = trunklineAdvanceDetailClient.selectByOrderCodeAndWarehouseId(orderCode); if (!list.isEmpty()) { List orderPackageCodes = list.stream().map(TrunklineAdvanceDetailEntity::getOrderPackageCode).collect(Collectors.toList()); - info = handlePackageGroupByWarehouse(list,warehouseIdList,orderPackageCodes,Objects.isNull(myCurrentWarehouse),orderCode); + info = handlePackageGroupByWarehouse(list, warehouseIdList, orderPackageCodes, Objects.isNull(myCurrentWarehouse), orderCode); return R.data(info); } - return R.data(info,"未查询到相关出入库信息"); + return R.data(info, "未查询到相关出入库信息"); } - private Map> handlePackageGroupByWarehouse(List list, List warehouseIdList, List orderPackageCodes, boolean aNull,String orderCode) { - Map> info = new HashMap<>(); + private Map> handlePackageGroupByWarehouse(List list, List warehouseIdList, List orderPackageCodes, boolean aNull, String orderCode) { + Map> info = new HashMap<>(); List parcelListEntities = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getOrderCode, orderCode) - .in(DistributionParcelListEntity::getOrderPackageCode, orderPackageCodes) + .eq(DistributionParcelListEntity::getOrderCode, orderCode) + .in(DistributionParcelListEntity::getOrderPackageCode, orderPackageCodes) // .eq(DistributionParcelListEntity::getIsTransfer, 0) - .in(!aNull,DistributionParcelListEntity::getWarehouseId,warehouseIdList) + .in(!aNull, DistributionParcelListEntity::getWarehouseId, warehouseIdList) ); if (!parcelListEntities.isEmpty()) { List distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntities); - info.put("warehouse",distributionParcelListVOS); + info.put("warehouse", distributionParcelListVOS); List collect = parcelListEntities.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList()); Iterator iterator = collect.iterator(); - while (iterator.hasNext()){ + while (iterator.hasNext()) { String next = iterator.next(); orderPackageCodes.remove(next); iterator.remove(); @@ -2897,9 +2954,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl collect = list.stream().filter(f -> orderPackageCodes.contains(f.getOrderPackageCode())).collect(Collectors.toList()); - List unWarehousePackage= handleUnWarehousePackage(collect); + List unWarehousePackage = handleUnWarehousePackage(collect); if (!unWarehousePackage.isEmpty()) { - info.put("unWarehouse",unWarehousePackage); + info.put("unWarehouse", unWarehousePackage); } } @@ -2914,7 +2971,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl listByWaybillIds = warehouseWaybillClient.findListByWaybillIds(waybillNos); if (!listByWaybillIds.isEmpty()) { - waybillMap = listByWaybillIds.stream().collect(Collectors.groupingBy(WarehouseWaybillEntity::getId)); + waybillMap = listByWaybillIds.stream().collect(Collectors.groupingBy(WarehouseWaybillEntity::getId)); } } for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : collect) { @@ -2931,7 +2988,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl - select lta.*, - lbc.client_name htMallName + if( NOW() > DATE_ADD(lta.create_time, INTERVAL 24 HOUR), 1,0) isTimeOut, + lbc.client_name htMallName from logpm_trunkline_advance lta - left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'') and lbtm.is_deleted = 0 + left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name + and lbtm.brand_name =lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'') and lbtm.is_deleted = 0 left join logpm_basicdata_client lbc on lbc.id = lbtm.client_id where lta.is_deleted = 0 - and lta.waybill_status = 0 - and lta.freeze_status = #{param.freezeStatus} - - and lta.warehouse_id in - - #{item} - - + and lta.waybill_status = 0 + and lta.freeze_status = #{param.freezeStatus} + + and lta.warehouse_id in + + #{item} + + and lta.has_package = #{param.hasPackage} @@ -71,6 +73,9 @@ and Locate(#{param.htMallName},lbc.client_name) > 0 + + and (NOW() > DATE_ADD(lta.create_time, INTERVAL 24 HOUR))= #{param.isTimeOut} + order by lta.create_time desc @@ -86,10 +91,10 @@ select id advanceId, - customer_name customerName, - customer_phone customerPhone, - customer_address customerAddress + customer_name customerName, + customer_phone customerPhone, + customer_address customerAddress from logpm_trunkline_advance where is_deleted = 0 and id in @@ -118,7 +123,7 @@ where id = #{id} - + delete from logpm_trunkline_advance @@ -134,13 +139,13 @@ where waybill_no = #{waybillNo} - + update logpm_trunkline_advance set total_num = total_num - 1 where id = #{advanceId} - + update logpm_trunkline_advance set incoming_warehouse_name = #{incomingWarehouseName} where id = #{advanceId} @@ -154,11 +159,11 @@ logpm_trunkline_advance lta left join logpm_trunkline_advance_detail ltad on ltad.advance_id = lta.id and ltad.package_status = '0' WHERE 1=1 - and lta.warehouse_id = #{param.warehouseId} - + and lta.warehouse_id = #{param.warehouseId} + and lta.train_number = #{param.incomingCode} - + and lta.order_code in #{item} @@ -195,7 +200,8 @@ select lta.* from logpm_trunkline_advance lta LEFT JOIN logpm_trunkline_advance_detail ltad on ltad.advance_id = lta.id - left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'') and lbtm.is_deleted = 0 + left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = + lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'') and lbtm.is_deleted = 0 where lta.is_deleted = 0 and ltad.package_status=0 and lta.freeze_status = #{param.freezeStatus} @@ -257,7 +263,7 @@ update logpm_trunkline_advance set waybill_no = null, - waybill_status = '0' + waybill_status = '0' where waybill_no = #{waybillNo} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 61491ae7b..be8d0a194 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -383,6 +383,7 @@ and t.tray_name like concat('%',#{param.trayName},'%') + order by t.entry_time_end asc diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index f2e702d84..a7b859361 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -345,21 +345,6 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl trunklineAdvanceVOIPage = baseMapper.advancePageList(page, advanceDTO); - -// List records = trunklineAdvanceVOIPage.getRecords(); -// for (TrunklineAdvanceVO trunklineAdvanceVO:records){ -// -// -// -// String dealerName = trunklineAdvanceVO.getDealerName(); -// String brand = trunklineAdvanceVO.getBrand(); -// Long clientId = tripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand); -// BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); -// if(!Objects.isNull(basicdataClientEntity)){ -// trunklineAdvanceVO.setHtMallName(basicdataClientEntity.getClientName()); -// } -// } -// trunklineAdvanceVOIPage.setRecords(records); return trunklineAdvanceVOIPage; }