From 196ff11a9b7e514dabea8757de00259d9b7fea4d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 08:42:59 +0800
Subject: [PATCH] feat(hrm): 同步考勤打卡能力到新高电力
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/performanceappraise/HrmPerformanceAppraiseController.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 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 31b1107..ae48955 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
@@ -6,6 +6,7 @@
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;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.performanceappraise.vo.*;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.performanceappraise.*;
@@ -16,21 +17,21 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Collections;
+import java.io.IOException;
+import java.util.Arrays;
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
@@ -112,30 +113,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());
}
// ========== 璇勫垎/缁撴灉 ==========
@@ -229,4 +228,25 @@
};
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆缁╂晥鑰冩牳鏂规妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<HrmPerformanceAppraiseImportExcelVO> list = Arrays.asList(
+ HrmPerformanceAppraiseImportExcelVO.builder().name("2026骞�8鏈堢哗鏁堣�冩牳").periodType(1)
+ .period("2026-08").scopeType(1).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "缁╂晥鑰冩牳鏂规瀵煎叆妯℃澘.xls", "缁╂晥鑰冩牳鏂规鍒楄〃", HrmPerformanceAppraiseImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆缁╂晥鑰冩牳鏂规")
+ @PreAuthorize("@ss.hasPermission('hrm:performance-appraise:import')")
+ public CommonResult<HrmPerformanceAppraiseImportRespVO> importExcel(@Valid HrmPerformanceAppraiseImportReqVO importReqVO)
+ throws Exception {
+ List<HrmPerformanceAppraiseImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), HrmPerformanceAppraiseImportExcelVO.class);
+ return success(appraiseService.importAppraiseList(list, importReqVO));
+ }
+
}
--
Gitblit v1.9.3