From e2bd15a65088a0350f1e1f09290d6e17008398a8 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 21 Apr 2025 15:29:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=94=9F=E6=88=90=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=B0=83=E5=B2=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/800pjcloudx_wallet.sql | 8 +- .../admin/api/dto/SysUserTransactionDto.java | 8 ++ .../api/entity/SysUserTransactionEntity.java | 130 ++++++++++++++++++ .../admin/api/vo/SysUserTransactionVo.java | 8 ++ .../SysUserTransactionController.java | 82 +++++++++++ .../mapper/SysUserTransactionMapper.java | 11 ++ .../service/SysUserTransactionService.java | 8 ++ .../impl/SysUserTransactionServiceImpl.java | 17 +++ .../mapper/SysUserTransactionMapper.xml | 25 ++++ 9 files changed, 293 insertions(+), 4 deletions(-) create mode 100644 pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserTransactionDto.java create mode 100644 pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUserTransactionEntity.java create mode 100644 pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SysUserTransactionVo.java create mode 100644 pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserTransactionController.java create mode 100644 pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserTransactionMapper.java create mode 100644 pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserTransactionService.java create mode 100644 pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java create mode 100644 pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserTransactionMapper.xml diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index e5c5c8dc2..292582a18 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -6,10 +6,10 @@ create database `pjcloudx_wallet` default character set utf8mb4 collate utf8mb4_ DROP TABLE IF EXISTS sys_user_transaction; CREATE TABLE `sys_user_transaction` ( - id bigint NOT NULL COMMENT '编号', - user_id bigint NOT NULL COMMENT '用户id', + id bigint NOT NULL COMMENT '编号', + user_id bigint NOT NULL COMMENT '用户id', biz_id bigint DEFAULT NULL COMMENT '业务id', - biz_type varchar(32) NOT NULL COMMENT '业务类型', + biz_type varchar(32) NOT NULL COMMENT '业务类型', # 岗位调动字段 source_dept_id bigint DEFAULT NULL COMMENT '源部门id', target_dept_id bigint DEFAULT NULL COMMENT '目标部门id', @@ -18,7 +18,7 @@ CREATE TABLE `sys_user_transaction` wallet_transaction_time datetime DEFAULT NULL COMMENT '离职自动转账时间', # 审批字读 process_id varchar(256) DEFAULT NULL COMMENT '流程id', - process_status varchar(10) DEFAULT NULL NOT NULL COMMENT '审核状体', + process_status varchar(10) DEFAULT NULL COMMENT '审核状体', process_time datetime DEFAULT NULL COMMENT '审核时间', create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', create_time datetime DEFAULT NULL COMMENT '创建时间', diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserTransactionDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserTransactionDto.java new file mode 100644 index 000000000..13abcc964 --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserTransactionDto.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.admin.api.dto; + +import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; +import lombok.Data; + +@Data +public class SysUserTransactionDto extends SysUserTransactionEntity { +} diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUserTransactionEntity.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUserTransactionEntity.java new file mode 100644 index 000000000..79cc2908b --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUserTransactionEntity.java @@ -0,0 +1,130 @@ +package com.bsd.pjcloud.admin.api.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 人员调动表 + */ +@Data +@TenantTable +@TableName("sys_user_transaction") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "人员调动表") +public class SysUserTransactionEntity extends Model { + + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="编号") + private Long id; + + /** + * 用户id + */ + @Schema(description="用户id") + private Long userId; + + /** + * 业务id + */ + @Schema(description="业务id") + private Long bizId; + + /** + * 业务类型 + */ + @Schema(description="业务类型") + private String bizType; + + /** + * 源部门id + */ + @Schema(description="源部门id") + private Long sourceDeptId; + + /** + * 目标部门id + */ + @Schema(description="目标部门id") + private Long targetDeptId; + + /** + * 是否离职自动转账 + */ + @Schema(description="是否离职自动转账") + private String isWalletTransaction; + + /** + * 离职自动转账时间 + */ + @Schema(description="离职自动转账时间") + private LocalDateTime walletTransactionTime; + + /** + * 流程id + */ + @Schema(description="流程id") + private String processId; + + /** + * 审核状体 + */ + @Schema(description="审核状体") + private String processStatus; + + /** + * 审核时间 + */ + @Schema(description="审核时间") + private LocalDateTime processTime; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description="租户ID") + private Long tenantId; +} \ No newline at end of file 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 new file mode 100644 index 000000000..7b9283e8b --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SysUserTransactionVo.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.admin.api.vo; + +import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; +import lombok.Data; + +@Data +public class SysUserTransactionVo extends SysUserTransactionEntity { +} 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 new file mode 100644 index 000000000..a7df874e6 --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserTransactionController.java @@ -0,0 +1,82 @@ +package com.bsd.pjcloud.admin.controller; + +import cn.hutool.core.util.ArrayUtil; +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.common.core.util.R; +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; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 人员调动表 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/sysUserTransaction" ) +@Tag(description = "sysUserTransaction" , name = "人员调动表管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class SysUserTransactionController { + + private final SysUserTransactionService sysUserTransactionService; + + @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) { + return R.ok(sysUserTransactionService.getById(id)); + } + + @Operation(summary = "新增人员调动表" , description = "新增人员调动表" ) + @SysLog("新增人员调动表" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_add')" ) + public R save(@RequestBody SysUserTransactionEntity sysUserTransaction) { + return R.ok(sysUserTransactionService.save(sysUserTransaction)); + } + + @Operation(summary = "修改人员调动表" , description = "修改人员调动表" ) + @SysLog("修改人员调动表" ) + @PutMapping + @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删除人员调动表" ) + @DeleteMapping + @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) { + 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 new file mode 100644 index 000000000..2ba01b5a0 --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserTransactionMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.admin.mapper; + +import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SysUserTransactionMapper extends PjcloudBaseMapper { + + +} \ 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 new file mode 100644 index 000000000..eff4c358e --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserTransactionService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; + +public interface SysUserTransactionService extends IService { + +} \ 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 new file mode 100644 index 000000000..736d5da81 --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java @@ -0,0 +1,17 @@ +package com.bsd.pjcloud.admin.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; +import com.bsd.pjcloud.admin.mapper.SysUserTransactionMapper; +import com.bsd.pjcloud.admin.service.SysUserTransactionService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +/** + * 人员调动表 + */ +@Slf4j +@Service +@AllArgsConstructor +public class SysUserTransactionServiceImpl extends ServiceImpl implements SysUserTransactionService { +} \ 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 new file mode 100644 index 000000000..f2e525b90 --- /dev/null +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserTransactionMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file