From e467193f0390ed882f992668c3c2c955e414d1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 8 May 2026 09:52:36 +0800 Subject: [PATCH] =?UTF-8?q?oms=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0shipperid;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/facade/ISysTableConfigService.java | 4 ++-- .../repository/mapper/SysTableConfigMapper.java | 10 +++++----- .../persistence/SysTableConfigServiceImpl.java | 12 ++++++------ .../facade/sysTableConfig/SysTableConfigApi.java | 10 ++++++---- .../mapper/sysTableConfig/SysTableConfigMapper.xml | 3 +++ 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java index b026e1ffb..8a4fc9f8f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java @@ -25,14 +25,14 @@ public interface ISysTableConfigService extends IService { * @param key 配置键 * @return 配置信息 */ - SysTableConfig getByOrgIdAndKey(Long organizationId, String key,Long warehouseId); + SysTableConfig getByOrgIdAndKey(Long organizationId, String key,Long warehouseId,Long shipperId); /** * 根据组织 ID 查询所有配置 * @param organizationId 组织 ID * @return 配置列表 */ - List listByOrgId(Long organizationId,Long warehouseId); + List listByOrgId(Long organizationId,Long warehouseId,Long shipperId); /** * 保存或更新配置（根据组织 ID 和键判断是新增还是更新） diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java index db7843ef9..583fc18c6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java @@ -23,16 +23,16 @@ public interface SysTableConfigMapper extends BaseMapper { * @param key 配置键 * @return 配置信息 */ - @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} AND key = #{key} and warehouse_id = #{warehouseId}") - SysTableConfig getByOrgIdAndKey(@Param("organizationId") Long organizationId, @Param("key") String key, @Param("warehouseId") Long warehouseId); + @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} AND key = #{key} and warehouse_id = #{warehouseId} and shipper_id = #{shipperId}") + SysTableConfig getByOrgIdAndKey(@Param("organizationId") Long organizationId, @Param("key") String key, @Param("warehouseId") Long warehouseId, @Param("shipperId") Long shipperId); /** * 根据组织 ID 查询所有配置 * @param organizationId 组织 ID * @return 配置列表 */ - @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} and warehouse_id = #{warehouseId} ORDER BY create_time DESC") - List listByOrgId(@Param("organizationId") Long organizationId, @Param("warehouseId") Long warehouseId); + @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} and warehouse_id = #{warehouseId} and shipper_id = #{shipperId} ORDER BY create_time DESC") + List listByOrgId(@Param("organizationId") Long organizationId, @Param("warehouseId") Long warehouseId, @Param("shipperId") Long shipperId); /** * 分页查询配置列表 @@ -43,5 +43,5 @@ public interface SysTableConfigMapper extends BaseMapper { */ List queryList(Page page, @Param("organizationId") Long organizationId, - @Param("key") String key, @Param("warehouseId") Long warehouseId); + @Param("key") String key, @Param("warehouseId") Long warehouseId, @Param("shipperId") Long shipperId); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java index 9a6789653..cbed4e5c3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java @@ -41,30 +41,30 @@ public class SysTableConfigServiceImpl extends ServiceImpl list = sysTableConfigMapper.queryList(page, sysTableConfigDTO.getOrganizationId() != null ? sysTableConfigDTO.getOrganizationId().longValue() : null, - sysTableConfigDTO.getKey(), sysTableConfigDTO.getWarehouseId()); + sysTableConfigDTO.getKey(), sysTableConfigDTO.getWarehouseId(), sysTableConfigDTO.getShipperId()); return page.setRecords(list); } @Override - public SysTableConfig getByOrgIdAndKey(Long organizationId, String key,Long warehouseId) { + public SysTableConfig getByOrgIdAndKey(Long organizationId, String key, Long warehouseId, Long shipperId) { if (organizationId == null || StringUtils.isBlank(key)) { throw new ServiceException("组织 ID 和键不能为空"); } if (warehouseId == null) { throw new ServiceException("仓库 ID 不能为空"); } - return sysTableConfigMapper.getByOrgIdAndKey(organizationId, key,warehouseId); + return sysTableConfigMapper.getByOrgIdAndKey(organizationId, key, warehouseId, shipperId); } @Override - public List listByOrgId(Long organizationId, Long warehouseId) { + public List listByOrgId(Long organizationId, Long warehouseId, Long shipperId) { if (organizationId == null) { throw new ServiceException("组织 ID 不能为空"); } if (warehouseId == null) { throw new ServiceException("仓库 ID 不能为空"); } - return sysTableConfigMapper.listByOrgId(organizationId, warehouseId); + return sysTableConfigMapper.listByOrgId(organizationId, warehouseId, shipperId); } @Override @@ -90,7 +90,7 @@ public class SysTableConfigServiceImpl extends ServiceImpl getByOrgIdAndKey(@RequestParam(name="organizationId") Long organizationId, - @RequestParam(name="warehouseId") Long warehouseId, + @RequestParam(name="warehouseId", required=false) Long warehouseId, + @RequestParam(name="shipperId", required=false) Long shipperId, @RequestParam(name="key") String key) { try { - SysTableConfig config = sysTableConfigService.getByOrgIdAndKey(organizationId, key, warehouseId); + SysTableConfig config = sysTableConfigService.getByOrgIdAndKey(organizationId, key, warehouseId,shipperId); if (config == null) { return Result.ok("未找到对应配置"); } @@ -85,9 +86,10 @@ public class SysTableConfigApi extends BaseController { @ApiOperation(value = "系统表配置 - 根据组织 ID 查询所有配置", notes = "系统表配置 - 根据组织 ID 查询所有配置") @GetMapping(value = "/listByOrgId") public Result listByOrgId(@RequestParam(name="organizationId") Long organizationId, - @RequestParam(name="warehouseId") Long warehouseId) { + @RequestParam(name="warehouseId", required=false) Long warehouseId, + @RequestParam(name="shipperId", required=false) Long shipperId) { try { - List list = sysTableConfigService.listByOrgId(organizationId, warehouseId); + List list = sysTableConfigService.listByOrgId(organizationId, warehouseId, shipperId); return Result.ok(list); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/mhd_oms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml b/mhd_oms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml index 4ae5fc852..ec6de0967 100644 --- a/mhd_oms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml +++ b/mhd_oms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml @@ -28,6 +28,9 @@ AND a.warehouse_id = #{warehouseId} + + AND a.shipper_id = #{shipperId} + AND a.key LIKE CONCAT('%', #{key}, '%')