From 014c9ceb07a89c0274181ac6a8b3aceeb9104b45 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 21 Apr 2025 15:44:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BA=BA=E5=91=98=E8=B0=83=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/api/vo/SysUserTransactionVo.java | 11 ++++ .../SysUserTransactionController.java | 54 +++++++++++-------- .../mapper/SysUserTransactionMapper.java | 6 +++ .../service/SysUserTransactionService.java | 5 ++ .../impl/SysUserTransactionServiceImpl.java | 10 ++++ .../mapper/SysUserTransactionMapper.xml | 16 ++++-- 6 files changed, 77 insertions(+), 25 deletions(-) diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SysUserTransactionVo.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SysUserTransactionVo.java index 7b9283e8b..f04148792 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SysUserTransactionVo.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SysUserTransactionVo.java @@ -5,4 +5,15 @@ import lombok.Data; @Data public class SysUserTransactionVo extends SysUserTransactionEntity { + + /** + * 源部门名称 + */ + private String sourceDeptName; + + /** + * 目标部门名称 + */ + private String targetDeptName; + } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserTransactionController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserTransactionController.java index a7df874e6..1a8a9b1a2 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserTransactionController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserTransactionController.java @@ -5,9 +5,11 @@ 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.SysUserTransactionDto; +import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.log.annotation.SysLog; -import com.bsd.pjcloud.admin.entity.SysUserTransactionEntity; import com.bsd.pjcloud.admin.service.SysUserTransactionService; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; @@ -27,56 +29,64 @@ import java.util.Objects; */ @RestController @RequiredArgsConstructor -@RequestMapping("/sysUserTransaction" ) -@Tag(description = "sysUserTransaction" , name = "人员调动表管理" ) +@RequestMapping("/sys-user-transaction") +@Tag(description = "sys-user-transaction", name = "人员调动表管理") @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysUserTransactionController { - private final SysUserTransactionService sysUserTransactionService; + private final SysUserTransactionService sysUserTransactionService; - @Operation(summary = "分页查询" , description = "分页查询" ) - @GetMapping("/page" ) - @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_view')" ) + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_view')") public R getSysUserTransactionPage(@ParameterObject Page page, @ParameterObject SysUserTransactionEntity sysUserTransaction) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); return R.ok(sysUserTransactionService.page(page, wrapper)); } - @Operation(summary = "通过id查询" , description = "通过id查询" ) - @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_view')" ) - public R getById(@PathVariable("id" ) Long id) { + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page-join") + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_view')") + public R pageJoin(@ParameterObject Page page, @ParameterObject SysUserTransactionDto dto) { + DataScope dataScope = new DataScope(); + return R.ok(sysUserTransactionService.scopePageJoin(page, dto, dataScope)); + } + + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_view')") + public R getById(@PathVariable("id") Long id) { return R.ok(sysUserTransactionService.getById(id)); } - @Operation(summary = "新增人员调动表" , description = "新增人员调动表" ) - @SysLog("新增人员调动表" ) + @Operation(summary = "新增人员调动表", description = "新增人员调动表") + @SysLog("新增人员调动表") @PostMapping - @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_add')" ) + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_add')") public R save(@RequestBody SysUserTransactionEntity sysUserTransaction) { return R.ok(sysUserTransactionService.save(sysUserTransaction)); } - @Operation(summary = "修改人员调动表" , description = "修改人员调动表" ) - @SysLog("修改人员调动表" ) + @Operation(summary = "修改人员调动表", description = "修改人员调动表") + @SysLog("修改人员调动表") @PutMapping - @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_edit')" ) + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_edit')") public R updateById(@RequestBody SysUserTransactionEntity sysUserTransaction) { return R.ok(sysUserTransactionService.updateById(sysUserTransaction)); } - @Operation(summary = "通过id删除人员调动表" , description = "通过id删除人员调动表" ) - @SysLog("通过id删除人员调动表" ) + @Operation(summary = "通过id删除人员调动表", description = "通过id删除人员调动表") + @SysLog("通过id删除人员调动表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_del')" ) + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_del')") public R removeById(@RequestBody Long[] ids) { return R.ok(sysUserTransactionService.removeBatchByIds(CollUtil.toList(ids))); } @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_export')" ) - public List export(SysUserTransactionEntity sysUserTransaction,Long[] ids) { + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_export')") + public List export(SysUserTransactionEntity sysUserTransaction, Long[] ids) { return sysUserTransactionService.list(Wrappers.lambdaQuery(sysUserTransaction).in(ArrayUtil.isNotEmpty(ids), SysUserTransactionEntity::getId, ids)); } } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserTransactionMapper.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserTransactionMapper.java index 2ba01b5a0..f2b291c52 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserTransactionMapper.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserTransactionMapper.java @@ -1,11 +1,17 @@ package com.bsd.pjcloud.admin.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.admin.api.dto.SysUserTransactionDto; import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; +import com.bsd.pjcloud.admin.api.vo.SysUserTransactionVo; +import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface SysUserTransactionMapper extends PjcloudBaseMapper { + Page scopePageJoin(Page page, @Param("dto") SysUserTransactionDto dto, DataScope dataScope); } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserTransactionService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserTransactionService.java index eff4c358e..7d04cd4f4 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserTransactionService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserTransactionService.java @@ -1,8 +1,13 @@ 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.SysUserTransactionDto; import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; +import com.bsd.pjcloud.admin.api.vo.SysUserTransactionVo; +import com.bsd.pjcloud.common.data.datascope.DataScope; public interface SysUserTransactionService extends IService { + Page scopePageJoin(Page page, SysUserTransactionDto dto, DataScope dataScope); } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java index 736d5da81..d396d1af8 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java @@ -1,12 +1,17 @@ package com.bsd.pjcloud.admin.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.dto.SysUserTransactionDto; import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; +import com.bsd.pjcloud.admin.api.vo.SysUserTransactionVo; import com.bsd.pjcloud.admin.mapper.SysUserTransactionMapper; import com.bsd.pjcloud.admin.service.SysUserTransactionService; +import com.bsd.pjcloud.common.data.datascope.DataScope; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; + /** * 人员调动表 */ @@ -14,4 +19,9 @@ import org.springframework.stereotype.Service; @Service @AllArgsConstructor public class SysUserTransactionServiceImpl extends ServiceImpl implements SysUserTransactionService { + + @Override + public Page scopePageJoin(Page page, SysUserTransactionDto dto, DataScope dataScope) { + return baseMapper.scopePageJoin(page, dto, dataScope); + } } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserTransactionMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserTransactionMapper.xml index f2e525b90..d65c73b00 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserTransactionMapper.xml +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserTransactionMapper.xml @@ -2,8 +2,7 @@ - - + @@ -21,5 +20,16 @@ - + + + + + + + + + + + \ No newline at end of file