From 2cf4ef4d1059454594143ec940e5a870ced5c0b0 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 20 Jul 2026 16:50:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E4=BB=A3=E8=AE=A2=E9=A4=90=E7=94=A8=E6=88=B7=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/user/SysUserRelationTypeDto.java | 9 +++++++++ .../user/SysUserRelationTypeController.java | 15 ++++++++++++--- .../mapper/user/SysUserRelationTypeMapper.java | 11 +++++++++++ .../admin/service/SysUserRelationTypeService.java | 5 +++++ .../impl/user/SysUserRelationTypeServiceImpl.java | 8 ++++++++ .../wallet/api/entity/mch/MchManageEntity.java | 7 +++++++ 6 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/user/SysUserRelationTypeDto.java diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/user/SysUserRelationTypeDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/user/SysUserRelationTypeDto.java new file mode 100644 index 000000000..dbcccb7ec --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/user/SysUserRelationTypeDto.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.admin.api.dto.user; + +import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity; +import lombok.Data; + +@Data +public class SysUserRelationTypeDto extends SysUserRelationTypeEntity { + +} diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/user/SysUserRelationTypeController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/user/SysUserRelationTypeController.java index 8d1b9d951..fd0853f0e 100755 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/user/SysUserRelationTypeController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/user/SysUserRelationTypeController.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto; import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity; import com.bsd.pjcloud.admin.service.SysUserRelationTypeService; import com.bsd.pjcloud.common.core.util.R; @@ -30,15 +31,23 @@ public class SysUserRelationTypeController { private final SysUserRelationTypeService sysUserRelationTypeService; + /** + * 分页查询 + */ + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/select") + public R> selectList(@ParameterObject Page page, @ParameterObject SysUserRelationTypeDto dto) { + return R.ok(sysUserRelationTypeService.scopePageList(page, dto, null)); + } + /** * 分页查询 */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('dzc_sysUserRelationType_view')") - public R getSysUserRelationTypePage(@ParameterObject Page page, @ParameterObject SysUserRelationTypeEntity sysUserRelationType) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - return R.ok(sysUserRelationTypeService.page(page, wrapper)); + public R> scopePageList(@ParameterObject Page page, @ParameterObject SysUserRelationTypeDto dto) { + return R.ok(sysUserRelationTypeService.scopePageList(page, dto, null)); } /** diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/user/SysUserRelationTypeMapper.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/user/SysUserRelationTypeMapper.java index 6c17a8f48..5822aa639 100755 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/user/SysUserRelationTypeMapper.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/user/SysUserRelationTypeMapper.java @@ -1,10 +1,21 @@ package com.bsd.pjcloud.admin.mapper.user; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto; import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity; +import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import org.apache.ibatis.annotations.Mapper; @Mapper public interface SysUserRelationTypeMapper extends PjcloudBaseMapper { + default Page scopePageList(Page page, SysUserRelationTypeDto dto, DataScope dataScope) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(ObjectUtil.isNotEmpty(dto.getRelationTypeId()), SysUserRelationTypeEntity::getRelationTypeId, dto.getRelationTypeId()) + .like(ObjectUtil.isNotEmpty(dto.getRelationName()), SysUserRelationTypeEntity::getRelationName, dto.getRelationName()); + return selectPageByScope(page, wrapper, dataScope); + } } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserRelationTypeService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserRelationTypeService.java index de6445a3d..718b0193b 100755 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserRelationTypeService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserRelationTypeService.java @@ -1,12 +1,17 @@ package com.bsd.pjcloud.admin.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto; import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity; +import com.bsd.pjcloud.common.data.datascope.DataScope; import java.util.ArrayList; public interface SysUserRelationTypeService extends IService { + Page scopePageList(Page page, SysUserRelationTypeDto dto, DataScope dataScope); + /** * 新增用户关系类型表 */ diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationTypeServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationTypeServiceImpl.java index e039f911e..442db4d90 100755 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationTypeServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationTypeServiceImpl.java @@ -1,12 +1,15 @@ package com.bsd.pjcloud.admin.service.impl.user; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto; import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationEntity; import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity; import com.bsd.pjcloud.admin.mapper.user.SysUserRelationMapper; import com.bsd.pjcloud.admin.mapper.user.SysUserRelationTypeMapper; import com.bsd.pjcloud.admin.service.SysUserRelationTypeService; +import com.bsd.pjcloud.common.data.datascope.DataScope; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +25,11 @@ public class SysUserRelationTypeServiceImpl extends ServiceImpl scopePageList(Page page, SysUserRelationTypeDto dto, DataScope dataScope) { + return baseMapper.scopePageList(page, dto, dataScope); + } + /** * 新增用户关系类型表 */ diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java index 04c8eefe8..d73eb6b63 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java @@ -225,6 +225,9 @@ public class MchManageEntity extends Model { @Schema(description = "租户ID") private Long tenantId; + /** + * 订餐详细配置 + */ @Data public static class TableReservationConf { @@ -233,6 +236,10 @@ public class MchManageEntity extends Model { */ private Boolean singleProductOnlyInCart = false; + /** + * 为什么的`用户关系类型`代订餐(一般是监护人为被监护人代订餐) + */ + private List userRelationTypeIdList; } @Data