From f11a6d480cd3ab350c3d87cd2e988b17cd084554 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 11 Jun 2024 10:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=B0=E7=82=B9=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=B8=82\?= =?UTF-8?q?=E5=8C=BA=E5=8E=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java | 6 ------ .../yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java index ca609927af..cb1b33e5d8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java @@ -61,16 +61,10 @@ public class ScmWarehouseVo implements Vo { @ApiModelProperty("名称") private String warehouseName; // 名称 - @ApiModelProperty("省sid") - private String provinceSid; @ApiModelProperty("province") private String province; - @ApiModelProperty("市sid") - private String citySid; @ApiModelProperty("city") private String city; - @ApiModelProperty("收货县区sid") - private String countySid; @ApiModelProperty("county") private String county; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index 5a9cc1e5b2..9eb0cf04c5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -99,6 +99,9 @@ public class ScmWarehouseService extends MybatisBaseService qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmWarehouseVo record : pagging.getRecords()) { + record.setWarehouseAttribute(record.getCity() + record.getCounty() + record.getWarehouseAttribute()); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; }