From bede041960fbfa13a80e55de35335659d68b27a6 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 26 Jun 2023 18:10:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/launch/LauncherServiceImpl.java | 1 + .../logpm/distribution/entity/DistributionStockupEntity.java | 5 +++++ .../logpm/distribution/mapper/DistributionStockupMapper.java | 2 +- .../logpm/distribution/mapper/DistributionStockupMapper.xml | 2 +- .../service/impl/DistributionStockupServiceImpl.java | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index adaf9c0d1..ea4c8d1ee 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -40,6 +40,7 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); +// PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java index be07a8d89..921c545f8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java @@ -104,6 +104,11 @@ public class DistributionStockupEntity extends TenantEntity { */ @ApiModelProperty(value = "预留5") private String reserve5; + /** + * 服务类型 1 商 2 市 3 自 + */ + @ApiModelProperty(value = "服务类型 1 商 2 市 3 自") + private String typeService; /** * 备货区编号 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java index 86fe0ce4a..10227af89 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java @@ -51,5 +51,5 @@ public interface DistributionStockupMapper extends BaseMapper exportDistributionStockup(@Param("ew") Wrapper queryWrapper); - IPage pageList(IPage page, DistributionStockupEntity distributionStockupEntity); + IPage pageList(IPage page,@Param("param") DistributionStockupEntity distributionStockupEntity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index d602de786..be044ebb3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -42,7 +42,7 @@ LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id LEFT JOIN logpm_basicdata_team_group btg ON lds.loader = btg.id - + lds.tenant_id = #{param.tenantId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 8a5b5feae..1d446fe04 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -23,6 +23,7 @@ import com.logpm.distribution.vo.DistributionStockupVO; import com.logpm.distribution.excel.DistributionStockupExcel; import com.logpm.distribution.mapper.DistributionStockupMapper; import com.logpm.distribution.service.IDistributionStockupService; +import org.springblade.core.secure.utils.AuthUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -80,6 +81,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl pageList(IPage page, Map distributionStockup) { DistributionStockupEntity distributionStockupEntity = JSON.parseObject(JSON.toJSONString(distributionStockup), DistributionStockupEntity.class); + distributionStockupEntity.setTenantId(AuthUtil.getTenantId()); return baseMapper.pageList(page,distributionStockupEntity); }