From e10c196ff7348a4461e8facee10a208779244ece Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 30 九月 2026 15:33:30 +0800
Subject: [PATCH] 宁夏万通需求：出库单行支持主/辅单位录入；考勤节假日配置改为时间段；物料型号维护；设备批量删除；来料检验默认方案解析
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
index 817f4f0..594b2fb 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
@@ -15,6 +15,7 @@
import cn.iocoder.yudao.module.hrm.service.salary.HrmSalaryPaymentService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -41,10 +42,12 @@
private HrmEmployeeService employeeService;
@Resource
private DeptApi deptApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@GetMapping("/page")
@Operation(summary = "鑾峰緱钖祫鍙戞斁鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<PageResult<HrmSalaryPaymentRespVO>> getSalaryPaymentPage(@Valid HrmSalaryPaymentPageReqVO pageReqVO) {
PageResult<HrmSalaryPaymentDO> pageResult = salaryPaymentService.getSalaryPaymentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, HrmSalaryPaymentRespVO.class));
@@ -53,16 +56,18 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱钖祫鍙戞斁")
@Parameter(name = "id", description = "鍙戞斁ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<HrmSalaryPaymentRespVO> getSalaryPayment(@RequestParam("id") Long id) {
HrmSalaryPaymentDO salaryPayment = salaryPaymentService.getSalaryPayment(id);
- return success(BeanUtils.toBean(salaryPayment, HrmSalaryPaymentRespVO.class));
+ HrmSalaryPaymentRespVO respVO = BeanUtils.toBean(salaryPayment, HrmSalaryPaymentRespVO.class);
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("hrm_salary_payment", id));
+ return success(respVO);
}
@PostMapping("/generate")
@Operation(summary = "鐢熸垚钖祫鍙戞斁鍙拌处")
@Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡", required = true, example = "2024-01")
- @PreAuthorize("@ss.hasPermission('hrm:salary:generate')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:generate')")
public CommonResult<Long> generatePayment(@RequestParam("period") String period) {
return success(salaryPaymentService.generatePayment(period));
}
@@ -70,7 +75,7 @@
@PostMapping("/pay")
@Operation(summary = "鍙戞斁钖祫锛堟暣涓彴璐︼級")
@Parameter(name = "id", description = "鍙戞斁鍙拌处ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:pay')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:pay')")
public CommonResult<Boolean> paySalary(@RequestParam("id") Long id) {
salaryPaymentService.paySalary(id);
return success(true);
@@ -78,7 +83,7 @@
@PostMapping("/pay-detail")
@Operation(summary = "鎵归噺鍙戞斁钖祫鏄庣粏")
- @PreAuthorize("@ss.hasPermission('hrm:salary:pay')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:pay')")
public CommonResult<Boolean> paySalaryDetail(@RequestBody Map<String, List<Long>> request) {
List<Long> detailIds = request.get("detailIds");
salaryPaymentService.paySalaryDetail(detailIds);
@@ -87,7 +92,7 @@
@PostMapping("/revoke-detail")
@Operation(summary = "鎵归噺鎾ら攢钖祫鍙戞斁鏄庣粏")
- @PreAuthorize("@ss.hasPermission('hrm:salary:pay')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:pay')")
public CommonResult<Boolean> revokeSalaryPaymentDetail(@RequestBody Map<String, List<Long>> request) {
List<Long> detailIds = request.get("detailIds");
salaryPaymentService.revokeSalaryPaymentDetail(detailIds);
@@ -97,7 +102,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎钖祫鍙戞斁鍙拌处")
@Parameter(name = "id", description = "鍙戞斁鍙拌处ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:delete')")
public CommonResult<Boolean> deleteSalaryPayment(@RequestParam("id") Long id) {
salaryPaymentService.deleteSalaryPayment(id);
return success(true);
@@ -105,7 +110,7 @@
@GetMapping("/detail/page")
@Operation(summary = "鑾峰緱钖祫鍙戞斁鏄庣粏鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<PageResult<HrmSalaryPaymentDetailRespVO>> getSalaryPaymentDetailPage(@Valid HrmSalaryPaymentDetailPageReqVO pageReqVO) {
PageResult<HrmSalaryPaymentDetailDO> pageResult = salaryPaymentService.getSalaryPaymentDetailPage(pageReqVO);
List<HrmSalaryPaymentDetailRespVO> list = BeanUtils.toBean(pageResult.getList(), HrmSalaryPaymentDetailRespVO.class);
@@ -119,7 +124,7 @@
@GetMapping("/detail/list")
@Operation(summary = "鑾峰緱钖祫鍙戞斁鏄庣粏鍒楄〃")
@Parameter(name = "paymentId", description = "鍙戞斁鍙拌处ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<List<HrmSalaryPaymentDetailRespVO>> getSalaryPaymentDetailList(@RequestParam("paymentId") Long paymentId) {
List<HrmSalaryPaymentDetailDO> detailList = salaryPaymentService.getSalaryPaymentDetailListByPaymentId(paymentId);
List<HrmSalaryPaymentDetailRespVO> list = BeanUtils.toBean(detailList, HrmSalaryPaymentDetailRespVO.class);
--
Gitblit v1.9.3