From 6852be11f646c6c1fdef1ab61e37fdef62fc8c1d Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Tue, 25 Jun 2024 11:12:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AE=A2=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PlayOrderInfoController.java | 21 +++++++++++++++++++ .../module/entity/PlayOrderInfoEntity.java | 6 ++++++ .../order/module/vo/PlayOrderInfoQueryVo.java | 5 +++++ .../impl/PlayOrderInfoServiceImpl.java | 3 +++ .../system/service/SysRoleService.java | 7 +++++++ .../service/impl/SysRoleServiceImpl.java | 7 +++++++ 6 files changed, 49 insertions(+) diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java index 918fc97..d42841d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java @@ -6,6 +6,10 @@ import com.starry.admin.modules.order.module.entity.PlayOrderRandomInfoEntity; import com.starry.admin.modules.order.module.vo.*; import com.starry.admin.modules.order.service.IPlayOrderInfoService; import com.starry.admin.modules.order.service.IPlayOrderRandomInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; +import com.starry.admin.modules.system.entity.SysRoleEntity; +import com.starry.admin.modules.system.service.SysRoleService; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.annotation.Log; import com.starry.common.context.CustomSecurityContextHolder; import com.starry.common.enums.BusinessType; @@ -29,6 +33,12 @@ public class PlayOrderInfoController { @Resource private IPlayOrderInfoService orderInfoService; + @Resource + private SysRoleService sysRoleService; + + @Resource + private IPlayPersonnelGroupInfoService playPersonnelGroupInfoService; + @Resource private IPlayOrderRandomInfoService playOrderRandomInfoService; @@ -38,6 +48,17 @@ public class PlayOrderInfoController { */ @PostMapping("/listByPage") public R listByPage(@Validated @RequestBody PlayOrderInfoQueryVo vo) { + //查询当前登录用户所有角色信息 + for (String role : SecurityUtils.getLoginUser().getRoles()) { + SysRoleEntity entity = sysRoleService.selectByRoleId(role); + if (entity == null) { + continue; + } + //如果当前登录用户的身份是组长 + if ("leader".equals(entity.getRoleKey())) { + vo.setGroupId(playPersonnelGroupInfoService.selectByUserId(SecurityUtils.getUserId()).getId()); + } + } return R.ok(orderInfoService.selectOrderInfoPage(vo)); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java index f0d56e4..2f844fb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderInfoEntity.java @@ -42,6 +42,7 @@ public class PlayOrderInfoEntity extends BaseEntity { */ private String tenantId; + /** * 订单状态【0:1:2:3:4】 * 0：已下单（待接单） @@ -228,6 +229,11 @@ public class PlayOrderInfoEntity extends BaseEntity { */ private String acceptBy; + /** + * 订单分组ID（和接单人同一个分组,接单时设置） + */ + private String groupId; + /** * 接单时间 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java index 7998bc5..a1db3d3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java @@ -105,5 +105,10 @@ public class PlayOrderInfoQueryVo extends BasePageEntity { */ private List endOrderTime; + /** + * 分组ID + */ + private String groupId; + } \ No newline at end of file diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index 04240c2..e4a0cfa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -369,6 +369,9 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl selectOrderInfoPage(PlayOrderInfoQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = getCommonOrderQueryVo(ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class)); + if (StringUtils.isNotBlank(vo.getGroupId())) { + lambdaQueryWrapper.eq(PlayOrderInfoEntity::getGroupId, vo.getGroupId()); + } if (StringUtils.isNotBlank(vo.getPurchaserBy())) { lambdaQueryWrapper.eq(PlayOrderInfoEntity::getPurchaserBy, vo.getPurchaserBy()); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java index 44bcf8b..c1d002c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java @@ -19,6 +19,13 @@ import java.util.Set; */ public interface SysRoleService extends IService { + /** + * 根据roleId 查询角色 + * @param roleId 角色ID + * @return 角色 + */ + SysRoleEntity selectByRoleId(String roleId); + /** * 根据roleKey 查询角色 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java index 0e1d19c..349f979 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java @@ -49,6 +49,13 @@ public class SysRoleServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysRoleEntity::getRoleId, roleId); + return this.baseMapper.selectOne(lambdaQueryWrapper); + } + @Override public SysRoleEntity selectByRoleKey(String roleKey) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();