From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
index b90e2bc..8b8beef 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmSalaryCalculationDO;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.hrm.service.salary.HrmSalaryCalculationService;
+import cn.iocoder.yudao.module.mes.api.feedback.dto.MesProFeedbackWageDetailRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -48,7 +49,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱钖叕鏍哥畻鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
public CommonResult<PageResult<HrmSalaryCalculationRespVO>> getSalaryCalculationPage(@Valid HrmSalaryCalculationPageReqVO pageReqVO) {
PageResult<HrmSalaryCalculationDO> pageResult = salaryCalculationService.getSalaryCalculationPage(pageReqVO);
// 杞崲涓� VO
@@ -100,7 +100,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱钖叕鏍哥畻")
@Parameter(name = "id", description = "鏍哥畻ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
public CommonResult<HrmSalaryCalculationRespVO> getSalaryCalculation(@RequestParam("id") Long id) {
HrmSalaryCalculationDO salaryCalculation = salaryCalculationService.getSalaryCalculation(id);
if (salaryCalculation == null) {
@@ -123,11 +122,22 @@
return success(respVO);
}
+ @GetMapping("/work-wage-detail")
+ @Operation(summary = "鑾峰緱鍛樺伐鏌愭牳绠楀懆鏈熺殑鎶ュ伐宸ヨ祫鏄庣粏",
+ description = "鎸夋姤宸ヤ汉姹囨�诲彛寰勮繑鍥炴瘡鏉℃姤宸ュ崟鐨勪富宸ヨ祫銆佽緟鍔╁伐璧勩�佽嚜瀹氫箟宸ヨ祫瀛楁銆佽川閲忚皟鏁翠笌鏈�缁堝伐璧�")
+ @Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡锛屾牸寮� 2024-01", required = true, example = "2026-11")
+ @Parameter(name = "userId", description = "鍛樺伐缂栧彿锛堣柂閰牳绠楄褰曚腑鐨� userId锛�", required = true, example = "1024")
+ public CommonResult<List<MesProFeedbackWageDetailRespDTO>> getWorkWageDetail(
+ @RequestParam("period") String period,
+ @RequestParam("userId") Long userId) {
+ return success(salaryCalculationService.getWorkWageDetailList(period, userId));
+ }
+
@PostMapping("/calculate")
@Operation(summary = "鎵ц钖叕鏍哥畻")
@Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡", required = true, example = "2024-01")
@Parameter(name = "deptId", description = "閮ㄩ棬ID锛屼负绌哄垯鏍哥畻鎵�鏈夐儴闂�", example = "1")
- @PreAuthorize("@ss.hasPermission('hrm:salary:calculate')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:calculate')")
public CommonResult<Boolean> calculateSalary(@RequestParam("period") String period,
@RequestParam(value = "deptId", required = false) Long deptId) {
salaryCalculationService.calculateSalary(period, deptId);
@@ -136,7 +146,7 @@
@PostMapping("/confirm")
@Operation(summary = "鎵归噺纭钖叕鏍哥畻")
- @PreAuthorize("@ss.hasPermission('hrm:salary:confirm')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:confirm')")
public CommonResult<Boolean> confirmSalaryCalculation(@RequestBody Map<String, List<Long>> request) {
List<Long> ids = request.get("ids");
salaryCalculationService.confirmSalaryCalculation(ids);
@@ -145,7 +155,7 @@
@PostMapping("/revoke")
@Operation(summary = "鎵归噺鎾ら攢钖叕鏍哥畻纭")
- @PreAuthorize("@ss.hasPermission('hrm:salary:confirm')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:confirm')")
public CommonResult<Boolean> revokeSalaryCalculation(@RequestBody Map<String, List<Long>> request) {
List<Long> ids = request.get("ids");
salaryCalculationService.revokeSalaryCalculation(ids);
@@ -155,7 +165,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎钖叕鏍哥畻璁板綍")
@Parameter(name = "id", description = "鏍哥畻ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:delete')")
public CommonResult<Boolean> deleteSalaryCalculation(@RequestParam("id") Long id) {
salaryCalculationService.deleteSalaryCalculation(id);
return success(true);
@@ -163,7 +173,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭钖叕鏍哥畻 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:salary:export')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportSalaryCalculationExcel(@Valid HrmSalaryCalculationPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -183,7 +193,6 @@
@Operation(summary = "棰勮閮ㄩ棬涓嬫墍鏈夊憳宸ョ殑钖祫鏍哥畻淇℃伅")
@Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡", required = true, example = "2024-01")
@Parameter(name = "deptId", description = "閮ㄩ棬ID锛屼负绌哄垯鏌ヨ鍏ㄩ儴", example = "1")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
public CommonResult<List<HrmSalaryCalculationRespVO>> previewSalaryCalculation(
@RequestParam("period") String period,
@RequestParam(value = "deptId", required = false) Long deptId) {
@@ -200,7 +209,7 @@
@PostMapping("/save")
@Operation(summary = "鎵归噺淇濆瓨钖叕鏍哥畻璁板綍")
- @PreAuthorize("@ss.hasPermission('hrm:salary:calculate')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:save')")
public CommonResult<Boolean> saveSalaryCalculation(@Valid @RequestBody HrmSalaryCalculationSaveReqVO saveReqVO) {
// 杞崲涓� DO 鍒楄〃
List<HrmSalaryCalculationDO> calculationList = saveReqVO.getList().stream()
--
Gitblit v1.9.3