From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/performanceappraise/HrmPerformanceAppraiseController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/performanceappraise/HrmPerformanceAppraiseController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/performanceappraise/HrmPerformanceAppraiseController.java
index 894d5f9..6357ac1 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/performanceappraise/HrmPerformanceAppraiseController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/performanceappraise/HrmPerformanceAppraiseController.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.hrm.controller.admin.performanceappraise;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -19,16 +21,13 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - HRM 缁╂晥鑰冩牳鏂规")
@RestController
@@ -110,30 +109,28 @@
// ========== 瀹℃壒 ==========
- @PostMapping("/submit")
- @Operation(summary = "鎻愪氦缁╂晥鑰冩牳鏂规瀹℃壒")
+ @PutMapping("/submit")
+ @Operation(summary = "鎻愪氦瀹℃壒锛堣崏绋�/瀹℃牳涓嶉�氳繃鈫掑鎵逛腑锛夛紝瀹℃壒浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
@Parameter(name = "id", description = "鏂规缂栧彿", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:performance-appraise:submit')")
- public CommonResult<Boolean> submitAppraise(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- appraiseService.submitAppraise(id, processDefinitionKey, getLoginUserId());
+ @PreAuthorize("@ss.hasPermission('hrm:performance-appraise:update')")
+ public CommonResult<Boolean> submitAppraise(@RequestParam("id") Long id) {
+ appraiseService.submitAppraise(id);
return success(true);
}
@PutMapping("/audit")
- @Operation(summary = "瀹℃壒缁╂晥鑰冩牳鏂规锛堥�氳繃/椹冲洖锛�")
+ @Operation(summary = "瀹℃牳锛堝鎵逛腑鈫掑鏍搁�氳繃/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
@PreAuthorize("@ss.hasPermission('hrm:performance-appraise:audit')")
public CommonResult<Boolean> auditAppraise(@Valid @RequestBody HrmPerformanceAppraiseAuditReqVO auditReqVO) {
- appraiseService.auditAppraise(auditReqVO);
+ appraiseService.auditAppraise(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
return success(true);
}
- @GetMapping("/approve-process-list")
- @Operation(summary = "鑾峰緱缁╂晥鑰冩牳鏂规瀹℃壒娴佺▼瀹氫箟鍒楄〃")
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
@PreAuthorize("@ss.hasPermission('hrm:performance-appraise:query')")
- public CommonResult<List<Map<String, Object>>> getAppraiseApproveProcessDefinitionList() {
- return success(appraiseService.getAppraiseApproveProcessDefinitionList());
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(appraiseService.getAppraiseApproverUserIds());
}
// ========== 璇勫垎/缁撴灉 ==========
@@ -179,10 +176,21 @@
return success(buildResultRespVO(result, employeeService.getEmployee(employeeId)));
}
+ @PostMapping("/generate-appraisees")
+ @Operation(summary = "鐢熸垚琚�冩牳浜猴紙鎸夎�冩牳鑼冨洿锛屽箓绛夛級")
+ @Parameter(name = "appraiseId", description = "鏂规缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('hrm:performance-appraise:update')")
+ public CommonResult<Integer> generateAppraisees(@RequestParam("appraiseId") Long appraiseId) {
+ return success(appraiseService.generateAppraisees(appraiseId));
+ }
+
// ========== 鍐呴儴鏂规硶锛氭嫾瑁� VO ==========
private HrmPerformanceAppraiseRespVO buildAppraiseRespVO(HrmPerformanceAppraiseDO appraise) {
HrmPerformanceAppraiseRespVO vo = BeanUtils.toBean(appraise, HrmPerformanceAppraiseRespVO.class);
+ if (StrUtil.isNotEmpty(appraise.getScopeTeamIds())) {
+ vo.setScopeTeamIds(JSONUtil.toList(appraise.getScopeTeamIds(), Long.class));
+ }
vo.setStatusName(convertAppraiseStatusName(appraise.getStatus()));
vo.setAuditStatusName(HrmAuditStatusEnum.getNameByStatus(appraise.getAuditStatus()));
vo.setItemCount(appraiseService.getAppraiseItemList(appraise.getId()).size());
--
Gitblit v1.9.3