From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java
index d956af0..60d2b5d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java
@@ -7,6 +7,7 @@
import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeeContractSaveReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeeContractTerminateReqVO;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeContractService;
+import cn.iocoder.yudao.module.hrm.service.remind.HrmExpiryRemindService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,6 +27,8 @@
@Resource
private HrmEmployeeContractService contractService;
+ @Resource
+ private HrmExpiryRemindService expiryRemindService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鍛樺伐鍚堝悓")
@@ -62,21 +65,23 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍛樺伐鍚堝悓璇︽儏")
@Parameter(name = "id", description = "鍚堝悓ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:employee-contract:query')")
public CommonResult<HrmEmployeeContractRespVO> getContract(@RequestParam("id") Long id) {
return success(contractService.getContract(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍛樺伐鍚堝悓鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:employee-contract:query')")
public CommonResult<PageResult<HrmEmployeeContractRespVO>> getContractPage(@Valid HrmEmployeeContractPageReqVO pageReqVO) {
+ // 鎳掕Е鍙戯細鏈変汉鎵撳紑鍚堝悓鍒楄〃鏃堕『甯﹁ˉ鎵嵆灏嗗埌鏈熷悎鍚屽苟鍙戦�佺珯鍐呬俊鎻愰啋锛坆est-effort锛�
+ try {
+ expiryRemindService.sendContractExpireRemind();
+ } catch (Exception ignored) {
+ }
return success(contractService.getContractPage(pageReqVO));
}
@GetMapping("/expiring-count")
@Operation(summary = "鑾峰緱鍗冲皢鍒版湡鍚堝悓鏁伴噺", description = "渚� HRM 寰呭姙/棣栭〉鎻愰啋浣跨敤")
- @PreAuthorize("@ss.hasPermission('hrm:employee-contract:query')")
public CommonResult<Long> getExpiringCount() {
return success(contractService.getExpiringCount());
}
--
Gitblit v1.9.3