From 824b3bee4d838cf26060b59e2e226c83da5cf8fc Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 15 十月 2026 17:16:56 +0800
Subject: [PATCH] fix(hrm): 员工导入日期列容错解析（支持 2015年 / 2015-01-01 / Excel序列号），修复含非标准日期时整表报系统异常
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
index 4d4829a..e1c4c6a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
@@ -205,8 +205,8 @@
List<HrmEmployeeImportExcelVO> list = Arrays.asList(
HrmEmployeeImportExcelVO.builder().name("寮犱笁").gender(1).phone("13800138000")
.deptName("鐮斿彂閮�").postName("閮ㄩ棬缁忕悊,椤圭洰缁忕悊").roleNames("鏅�氱鐞嗗憳")
- .hireDate(LocalDate.of(2020, 3, 1)).employeeStatus(1)
- .idCard("320102199001150011").birthday(LocalDate.of(1990, 1, 15))
+ .hireDate("2020-03-01").employeeStatus(1)
+ .idCard("320102199001150011").birthday("1990-01-15")
.nation("姹夋棌").marriageStatus("宸插").age(36).education("鏈").politicalStatus("涓叡鍏氬憳")
.email("zhangsan@example.com").build()
);
@@ -222,4 +222,22 @@
return success(employeeService.importEmployeeList(list, importReqVO));
}
+ @PutMapping("/regular")
+ @Operation(summary = "鍛樺伐杞", description = "浠呫�庡姵鍔ㄥ悎鍚屻�忓憳宸ュ彲杞锛涘姵鍔″悎鍚屼笉杞銆傝浆姝ｅ彧鏀圭姸鎬�+杞鏃ユ湡锛屼笉鍚皟宀�")
+ @Parameter(name = "id", description = "鍛樺伐ID", required = true)
+ @PreAuthorize("@ss.hasPermission('hrm:employee:update')")
+ public CommonResult<Boolean> regularizeEmployee(@RequestParam("id") Long id) {
+ employeeService.regularizeEmployee(id);
+ return success(true);
+ }
+
+ @GetMapping("/regularize-reminders")
+ @Operation(summary = "鑾峰緱寰呰浆姝ｆ彁閱掑垪琛�", description = "璇曠敤涓�佷笖褰撳墠涓哄姵鍔ㄥ悎鍚屻�佽瘯鐢ㄦ湡鍦� days 澶╁唴鍒版湡鐨勫憳宸�")
+ @PreAuthorize("@ss.hasPermission('hrm:employee:query')")
+ public CommonResult<List<HrmEmployeeRespVO>> getRegularizeReminders(
+ @RequestParam(value = "days", required = false, defaultValue = "7") Integer days) {
+ List<HrmEmployeeDO> list = employeeService.getRegularizeReminderList(days);
+ return success(BeanUtils.toBean(list, HrmEmployeeRespVO.class));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3