From ba100c651a81162a9a9a4533ff4d072f2889171a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期五, 06 十一月 2026 09:38:46 +0800
Subject: [PATCH] fix(hrm): 考勤统计支持员工姓名搜索;缺卡统计补全(与考勤记录联动)
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java | 11 +++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java | 8 ++
sql/mysql/hrm_attendance_record_fill_missing_clock_type.sql | 39 +++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java | 8 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceSummaryPageReqVO.java | 3 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java | 15 ++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java | 8 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java | 31 ++++++++++
8 files changed, 121 insertions(+), 2 deletions(-)
diff --git a/sql/mysql/hrm_attendance_record_fill_missing_clock_type.sql b/sql/mysql/hrm_attendance_record_fill_missing_clock_type.sql
new file mode 100644
index 0000000..d2fc129
--- /dev/null
+++ b/sql/mysql/hrm_attendance_record_fill_missing_clock_type.sql
@@ -0,0 +1,39 @@
+-- ============================================================
+-- 鑰冨嫟璁板綍锛氳ˉ榻愩�岀己鍗°�嶆爣璁帮紙鍘嗗彶鏁版嵁锛�
+--
+-- 鑳屾櫙锛�
+-- HrmAttendanceRecordServiceImpl#fillClockTypes 鍘熷疄鐜板彧鍦ㄣ�岃渚ф湁鎵撳崱鏃堕棿銆嶆椂
+-- 鎵嶈缃� clockInType / clockOutType锛屽鑷淬�屽彧鎵撲笂鐝崱銆佹病鎵撲笅鐝崱銆嶇殑璁板綍
+-- clockOutType 涓�鐩翠负 NULL銆�
+-- 鑰岃�冨嫟缁熻锛圚rmAttendanceSummaryServiceImpl#generateMonthlySummary锛夊彧缁熻
+-- clockInType/clockOutType = 4锛圡ISSING锛夌殑璁板綍锛屼簬鏄�岀己鍗℃鏁般�嶆案杩滀负 0锛�
+-- 涓庤�冨嫟璁板綍妯″潡瀵逛笉涓婏紙瀹㈡埛鍙嶉銆岀己鍗°�佹棭閫�鏁版嵁缁熻涓嶅銆嶏級銆�
+--
+-- 浠g爜宸蹭慨澶嶏細鐜板湪鍙鏌愪竴渚ф病鏈夋墦鍗℃椂闂村氨鏍囪涓� 4锛堢己鍗★級锛屼笖涓嶄緷璧栬�冨嫟瑙勫垯銆�
+-- 鏈剼鏈敤浜庝慨澶嶄慨澶嶅墠宸插叆搴撶殑鍘嗗彶鎵撳崱璁板綍銆�
+--
+-- 鏋氫妇锛欻rmAttendanceClockTypeEnum NORMAL(1) / LATE(2) / EARLY(3) / MISSING(4)
+-- ============================================================
+
+-- 1锛夌己涓婄彮鍗★細鏈夎褰曚絾 clock_in_time 涓虹┖锛屼笖绫诲瀷杩樻病鏍�
+UPDATE hrm_attendance_record
+SET clock_in_type = 4
+WHERE deleted = b'0'
+ AND clock_in_time IS NULL
+ AND clock_in_type IS NULL;
+
+-- 2锛夌己涓嬬彮鍗★細鏈夎褰曚絾 clock_out_time 涓虹┖锛屼笖绫诲瀷杩樻病鏍�
+UPDATE hrm_attendance_record
+SET clock_out_type = 4
+WHERE deleted = b'0'
+ AND clock_out_time IS NULL
+ AND clock_out_type IS NULL;
+
+-- 3锛夋牎楠岋細缂哄崱鏍囪鏁伴噺
+-- SELECT SUM(clock_in_type = 4) AS 缂轰笂鐝崱娆℃暟,
+-- SUM(clock_out_type = 4) AS 缂轰笅鐝崱娆℃暟
+-- FROM hrm_attendance_record WHERE deleted = b'0';
+
+-- 4锛夋敞鎰忥細淇畬鏁版嵁鍚庨渶瑕侀噸鏂扮敓鎴愯�冨嫟缁熻锛岀己鍗℃鏁版墠浼氬埛杩涙眹鎬昏〃锛�
+-- 鑰冨嫟绠$悊 鈫� 鑰冨嫟缁熻 鈫� 鐢熸垚缁熻锛堥�夊搴斿勾鏈堬級锛屾垨璋�
+-- POST /admin-api/hrm/attendance/summary/generate?yearMonth=YYYY-MM
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
index 2f5c8d1..d13d078 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.hrm.controller.admin.attendance;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -149,7 +150,15 @@
if (CollUtil.isNotEmpty(data)) {
fillUserInfo(data, pageResult.getList());
}
- ExcelUtils.write(response, "鑰冨嫟缁熻姹囨��.xls", "鏁版嵁", HrmAttendanceSummaryRespVO.class, data);
+ // 鏂囦欢鍚嶅甫涓婄瓫閫夋潯浠讹紝閬垮厤瀵煎嚭澶氫釜鏈堜唤鏁版嵁鏃惰璇涓恒�岄噸澶嶃��
+ String fileName = "鑰冨嫟缁熻姹囨��";
+ if (StrUtil.isNotBlank(pageReqVO.getYearMonth())) {
+ fileName = fileName + "_" + pageReqVO.getYearMonth();
+ } else if (pageReqVO.getStartDate() != null) {
+ fileName = fileName + "_" + pageReqVO.getStartDate()
+ + "_" + (pageReqVO.getEndDate() != null ? pageReqVO.getEndDate() : "鑷充粖");
+ }
+ ExcelUtils.write(response, fileName + ".xls", "鏁版嵁", HrmAttendanceSummaryRespVO.class, data);
}
}
\ No newline at end of file
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceSummaryPageReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceSummaryPageReqVO.java
index 6dc8287..5dd2b30 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceSummaryPageReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceSummaryPageReqVO.java
@@ -18,6 +18,9 @@
@Schema(description = "鍛樺伐ID", example = "1")
private Long userId;
+ @Schema(description = "鍛樺伐濮撳悕锛堟ā绯婂尮閰嶏紝涓� userId 鍚屾椂浼犳椂鍙栦氦闆嗭級", example = "浠讳紵")
+ private String userName;
+
@Schema(description = "閮ㄩ棬ID", example = "1")
private Long deptId;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
index 7ce97b7..c27c3a0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
@@ -47,6 +47,14 @@
return selectList(HrmEmployeeDO::getName, name);
}
+ /**
+ * 鎸夊鍚嶆ā绯婃煡璇㈠憳宸ワ紙鑰冨嫟缁熻绛夊垪琛ㄧ殑濮撳悕鎼滅储鐢級
+ */
+ default List<HrmEmployeeDO> selectListByNameLike(String name) {
+ return selectList(new LambdaQueryWrapperX<HrmEmployeeDO>()
+ .like(HrmEmployeeDO::getName, name));
+ }
+
default HrmEmployeeDO selectByEmployeeNo(String employeeNo) {
return selectOne(HrmEmployeeDO::getEmployeeNo, employeeNo);
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index 976f8e1..219195d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -94,9 +94,22 @@
}
/**
- * 鎸夎�冨嫟瑙勫垯閲嶇畻涓婁笅鐝墦鍗$被鍨嬶紙姝e父/杩熷埌/鏃╅��锛夛紝涓庢墦鍗¢�昏緫淇濇寔涓�鑷�
+ * 鎸夎�冨嫟瑙勫垯閲嶇畻涓婁笅鐝墦鍗$被鍨嬶紙姝e父/杩熷埌/鏃╅��/缂哄崱锛夛紝涓庢墦鍗¢�昏緫淇濇寔涓�鑷�
+ *
+ * <p>缂哄崱鏍囪涓嶄緷璧栬�冨嫟瑙勫垯锛氬彧瑕佹煇涓�渚ф病鏈夋墦鍗℃椂闂村氨鏄己鍗°��
+ * 鍘熷疄鐜板彧鍦ㄣ�岃渚ф湁鎵撳崱鏃堕棿銆嶆椂鎵嶈缃被鍨嬶紝瀵艰嚧銆屽彧鎵撲笂鐝崱銆佹病鎵撲笅鐝崱銆嶇殑璁板綍
+ * clockOutType 涓�鐩存槸 null锛涜�岃�冨嫟缁熻鍙 MISSING 绫诲瀷锛�
+ * 浜庢槸缂哄崱娆℃暟姘歌繙缁熻涓� 0锛堝鎴峰弽棣堛�岀己鍗℃暟鎹粺璁′笉瀵广�佹病鍜岃�冨嫟璁板綍鑱斿姩銆嶏級銆�
*/
private void fillClockTypes(HrmAttendanceRecordDO record) {
+ // 1. 缂哄崱浼樺厛锛氭煇涓�渚ф病鏈夋墦鍗℃椂闂村嵆涓虹己鍗★紝涓嶄緷璧栭儴闂ㄤ笌鑰冨嫟瑙勫垯
+ if (record.getClockInTime() == null) {
+ record.setClockInType(HrmAttendanceClockTypeEnum.MISSING.getType());
+ }
+ if (record.getClockOutTime() == null) {
+ record.setClockOutType(HrmAttendanceClockTypeEnum.MISSING.getType());
+ }
+
if (record.getDeptId() == null) {
return;
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java
index ab7ec40..f51d71b 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceSummaryServiceImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.hrm.service.attendance;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceSummaryPageReqVO;
@@ -206,12 +207,35 @@
if (pageReqVO.getStartDate() != null) {
return getAttendanceSummaryByDateRange(pageReqVO);
}
+ // 鍛樺伐濮撳悕妯$硦鎼滅储锛氬厛鎸夊鍚嶆煡鍑哄憳宸D锛屽啀鎸� ID 闆嗗悎杩囨护锛堟眹鎬昏〃鐨� user_id 瀛樼殑鏄憳宸D锛�
+ Set<Long> nameMatchedIds = resolveEmployeeIdsByName(pageReqVO.getUserName());
+ if (nameMatchedIds != null && nameMatchedIds.isEmpty()) {
+ // 濮撳悕鎼滀笉鍒颁换浣曞憳宸ユ椂鐩存帴杩斿洖绌猴紝閬垮厤閫�鍖栨垚鏌ュ叏閮�
+ return PageResult.empty();
+ }
return attendanceSummaryMapper.selectPage(pageReqVO, new LambdaQueryWrapperX<HrmAttendanceSummaryDO>()
.eqIfPresent(HrmAttendanceSummaryDO::getUserId, pageReqVO.getUserId())
+ .inIfPresent(HrmAttendanceSummaryDO::getUserId, nameMatchedIds)
.eqIfPresent(HrmAttendanceSummaryDO::getDeptId, pageReqVO.getDeptId())
.eqIfPresent(HrmAttendanceSummaryDO::getYearMonth, pageReqVO.getYearMonth())
.orderByDesc(HrmAttendanceSummaryDO::getYearMonth)
.orderByAsc(HrmAttendanceSummaryDO::getDeptId));
+ }
+
+ /**
+ * 鎸夊憳宸ュ鍚嶆ā绯婂尮閰嶏紝杩斿洖鍛樺伐ID闆嗗悎
+ *
+ * @return null 琛ㄧず鏈紶濮撳悕锛堜笉鍙備笌杩囨护锛夛紱绌洪泦鍚堣〃绀轰紶浜嗗鍚嶄絾娌℃湁浠讳綍鍛樺伐鍖归厤
+ */
+ private Set<Long> resolveEmployeeIdsByName(String userName) {
+ if (StrUtil.isBlank(userName)) {
+ return null;
+ }
+ List<HrmEmployeeDO> matched = employeeService.getEmployeeListByNameLike(userName.trim());
+ if (CollUtil.isEmpty(matched)) {
+ return Collections.emptySet();
+ }
+ return matched.stream().map(HrmEmployeeDO::getId).collect(Collectors.toSet());
}
/**
@@ -243,6 +267,13 @@
.filter(e -> reqVO.getUserId().equals(e.getId()))
.toList();
}
+ // 鍛樺伐濮撳悕妯$硦杩囨护
+ if (StrUtil.isNotBlank(reqVO.getUserName())) {
+ String keyword = reqVO.getUserName().trim();
+ employees = employees.stream()
+ .filter(e -> e.getName() != null && e.getName().contains(keyword))
+ .toList();
+ }
if (CollUtil.isEmpty(employees)) {
return PageResult.empty();
}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java
index d01cc36..9575745 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeService.java
@@ -130,6 +130,14 @@
/** 鏍规嵁鍛樺伐濮撳悕鑾峰彇鍛樺伐 */
HrmEmployeeDO getEmployeeByName(String name);
+ /**
+ * 鎸夊鍚嶆ā绯婃煡璇㈠憳宸ュ垪琛紙鍒楄〃椤靛鍚嶆悳绱㈢敤锛�
+ *
+ * @param name 濮撳悕鍏抽敭瀛�
+ * @return 鍛樺伐鍒楄〃
+ */
+ List<HrmEmployeeDO> getEmployeeListByNameLike(String name);
+
/** 鏍规嵁鍛樺伐濮撳悕鑾峰彇鎵�鏈夊悓鍚嶅憳宸� */
List<HrmEmployeeDO> getEmployeeListByName(String name);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
index f32091d..23778f5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/employee/HrmEmployeeServiceImpl.java
@@ -520,6 +520,14 @@
}
@Override
+ public List<HrmEmployeeDO> getEmployeeListByNameLike(String name) {
+ if (StrUtil.isBlank(name)) {
+ return new ArrayList<>();
+ }
+ return employeeMapper.selectListByNameLike(name.trim());
+ }
+
+ @Override
public HrmEmployeeImportRespVO importEmployeeList(List<HrmEmployeeImportExcelVO> importEmployees,
HrmEmployeeImportReqVO importReqVO) {
// 1. 鏍¢獙闈炵┖
--
Gitblit v1.9.3