feat:人员调动
This commit is contained in:
dzc committed
1 parent
e2bd15a650
commit
014c9ceb07
6 files changed
+77
-25
No files matched your search
+11
@@ -5,4 +5,15 @@ import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SysUserTransactionVo extends SysUserTransactionEntity {
|
||||
|
||||
/**
|
||||
* 源部门名称
|
||||
*/
|
||||
private String sourceDeptName;
|
||||
|
||||
/**
|
||||
* 目标部门名称
|
||||
*/
|
||||
private String targetDeptName;
|
||||
|
||||
}
|
||||
+32
-22
@@ -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<SysUserTransactionEntity> 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<SysUserTransactionEntity> export(SysUserTransactionEntity sysUserTransaction,Long[] ids) {
|
||||
@PreAuthorize("@pms.hasPermission('admin_sysUserTransaction_export')")
|
||||
public List<SysUserTransactionEntity> export(SysUserTransactionEntity sysUserTransaction, Long[] ids) {
|
||||
return sysUserTransactionService.list(Wrappers.lambdaQuery(sysUserTransaction).in(ArrayUtil.isNotEmpty(ids), SysUserTransactionEntity::getId, ids));
|
||||
}
|
||||
}
|
||||
+6
@@ -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<SysUserTransactionEntity> {
|
||||
|
||||
Page<SysUserTransactionVo> scopePageJoin(Page page, @Param("dto") SysUserTransactionDto dto, DataScope dataScope);
|
||||
|
||||
}
|
||||
+5
@@ -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<SysUserTransactionEntity> {
|
||||
|
||||
Page<SysUserTransactionVo> scopePageJoin(Page page, SysUserTransactionDto dto, DataScope dataScope);
|
||||
}
|
||||
+10
@@ -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<SysUserTransactionMapper, SysUserTransactionEntity> implements SysUserTransactionService {
|
||||
|
||||
@Override
|
||||
public Page<SysUserTransactionVo> scopePageJoin(Page page, SysUserTransactionDto dto, DataScope dataScope) {
|
||||
return baseMapper.scopePageJoin(page, dto, dataScope);
|
||||
}
|
||||
}
|
||||
+13
-3
@@ -2,8 +2,7 @@
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.bsd.pjcloud.admin.mapper.SysUserTransactionMapper">
|
||||
|
||||
<resultMap id="sysUserTransactionMap" type="com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity">
|
||||
<resultMap id="sysUserTransactionMap" type="com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity">
|
||||
<id property="id" column="id"/>
|
||||
<result property="userId" column="user_id"/>
|
||||
<result property="bizId" column="biz_id"/>
|
||||
@@ -21,5 +20,16 @@
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="tenantId" column="tenant_id"/>
|
||||
</resultMap>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectA">
|
||||
|
||||
</sql>
|
||||
|
||||
<sql id="whereA">
|
||||
|
||||
</sql>
|
||||
|
||||
<select id="scopePageJoin" resultType="com.bsd.pjcloud.admin.api.vo.SysUserTransactionVo">
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in new issue
Block a user