From 44840942aba889088a86d2b3d93856530bb2dc25 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期二, 25 八月 2026 16:51:29 +0800
Subject: [PATCH] Merge branch 'dev_business' into fix/hsy/20260811
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmLeaveTypeConfigController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmLeaveTypeConfigController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmLeaveTypeConfigController.java
index bc1898b..5c1af32 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmLeaveTypeConfigController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmLeaveTypeConfigController.java
@@ -2,6 +2,7 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmLeaveTypeConfigCreateReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmLeaveTypeConfigRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.HrmLeaveTypeConfigSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmLeaveTypeConfigDO;
@@ -30,7 +31,7 @@
@GetMapping("/list")
@Operation(summary = "鑾峰彇鎵�鏈夎鍋囩被鍨嬮厤缃垪琛�")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:leave-type-config:query')")
public CommonResult<List<HrmLeaveTypeConfigRespVO>> getLeaveTypeConfigList() {
List<HrmLeaveTypeConfigDO> list = leaveTypeConfigService.getLeaveTypeConfigList();
return success(BeanUtils.toBean(list, HrmLeaveTypeConfigRespVO.class));
@@ -39,19 +40,37 @@
@GetMapping("/get")
@Operation(summary = "鑾峰彇璇峰亣绫诲瀷閰嶇疆")
@Parameter(name = "leaveType", description = "璇峰亣绫诲瀷", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:leave-type-config:query')")
public CommonResult<HrmLeaveTypeConfigRespVO> getLeaveTypeConfig(@RequestParam("leaveType") Integer leaveType) {
HrmLeaveTypeConfigDO config = leaveTypeConfigService.getLeaveTypeConfig(leaveType);
return success(BeanUtils.toBean(config, HrmLeaveTypeConfigRespVO.class));
}
+ @PostMapping("/create")
+ @Operation(summary = "鏂板璇峰亣绫诲瀷閰嶇疆")
+ @PreAuthorize("@ss.hasPermission('hrm:leave-type-config:create')")
+ public CommonResult<Long> createLeaveTypeConfig(@Valid @RequestBody HrmLeaveTypeConfigCreateReqVO createReqVO) {
+ HrmLeaveTypeConfigDO config = BeanUtils.toBean(createReqVO, HrmLeaveTypeConfigDO.class);
+ leaveTypeConfigService.createLeaveTypeConfig(config);
+ return success(config.getId());
+ }
+
@PutMapping("/update")
@Operation(summary = "鏇存柊璇峰亣绫诲瀷閰嶇疆")
- @PreAuthorize("@ss.hasPermission('hrm:salary:update')")
+ @PreAuthorize("@ss.hasPermission('hrm:leave-type-config:update')")
public CommonResult<Boolean> updateLeaveTypeConfig(@Valid @RequestBody HrmLeaveTypeConfigSaveReqVO updateReqVO) {
HrmLeaveTypeConfigDO config = BeanUtils.toBean(updateReqVO, HrmLeaveTypeConfigDO.class);
leaveTypeConfigService.updateLeaveTypeConfig(config);
return success(true);
}
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎璇峰亣绫诲瀷閰嶇疆")
+ @Parameter(name = "id", description = "閰嶇疆ID", required = true)
+ @PreAuthorize("@ss.hasPermission('hrm:leave-type-config:delete')")
+ public CommonResult<Boolean> deleteLeaveTypeConfig(@RequestParam("id") Long id) {
+ leaveTypeConfigService.deleteLeaveTypeConfig(id);
+ return success(true);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3