From a385917c1f82edbdf1063ac1505bc9b57c6c1108 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 21:46:11 +0800
Subject: [PATCH] feat(hrm,bi): 移植长辉电力的考勤请假展示与 BI 大屏
---
src/api/hrm/attendance/record/index.ts | 144 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 129 insertions(+), 15 deletions(-)
diff --git a/src/api/hrm/attendance/record/index.ts b/src/api/hrm/attendance/record/index.ts
index 8962dc1..4ba6d04 100644
--- a/src/api/hrm/attendance/record/index.ts
+++ b/src/api/hrm/attendance/record/index.ts
@@ -10,6 +10,7 @@
userName?: string;
deptId?: number;
deptName?: string;
+ phone?: string;
date?: string;
clockInTime?: string;
clockOutTime?: string;
@@ -20,10 +21,87 @@
workHours?: number;
overtimeHours?: number;
location?: string;
+ /** 涓婄彮鎵撳崱缁忓害锛圵GS84锛� */
+ clockInLongitude?: number;
+ /** 涓婄彮鎵撳崱绾害锛圵GS84锛� */
+ clockInLatitude?: number;
+ /** 涓婄彮瀹氫綅绮惧害锛岀背 */
+ clockInAccuracy?: number;
+ /** 涓婄彮璺濇墦鍗″湴鐐硅窛绂伙紝绫� */
+ clockInDistance?: number;
+ /** 涓婄彮鎵撳崱鍦扮偣鍦板潃蹇収 */
+ clockInAddress?: string;
+ /** 涓嬬彮鎵撳崱缁忓害锛圵GS84锛� */
+ clockOutLongitude?: number;
+ /** 涓嬬彮鎵撳崱绾害锛圵GS84锛� */
+ clockOutLatitude?: number;
+ /** 涓嬬彮瀹氫綅绮惧害锛岀背 */
+ clockOutAccuracy?: number;
+ /** 涓嬬彮璺濇墦鍗″湴鐐硅窛绂伙紝绫� */
+ clockOutDistance?: number;
+ /** 涓嬬彮鎵撳崱鍦扮偣鍦板潃蹇収 */
+ clockOutAddress?: string;
dataSource?: number;
dataSourceName?: string;
+ /** 褰撳ぉ鏄惁璇峰亣锛堝瓨鍦ㄥ鎵归�氳繃涓斾笌宸ヤ綔鏃舵閲嶅彔鐨勮鍋囧崟锛� */
+ leaveFlag?: boolean;
+ /** 褰撳ぉ璇峰亣宸ユ椂锛堝皬鏃讹級锛屾湭璇峰亣涓� 0 */
+ leaveHours?: number;
+ /** 褰撳ぉ璇峰亣绫诲瀷锛岄�楀彿鍒嗛殧鐨� HrmLeaveTypeEnum.type锛屽 "1,2" */
+ leaveTypes?: string;
remark?: string;
createTime?: string;
+ }
+
+ /** 鎴戠殑鑰冨嫟鐘舵�侊紙/hrm/attendance/record/my-status锛� */
+ export interface AttendanceMyStatus {
+ /** 鍛樺伐濮撳悕 */
+ employeeName?: string;
+ userName?: string;
+ deptName?: string;
+ /** 鑰冨嫟鏃ユ湡 */
+ date?: string;
+ /** 鏈嶅姟鍣ㄦ椂闂� */
+ serverTime?: string;
+ /** 鏄惁宸ヤ綔鏃� */
+ workDay?: boolean;
+ /** 浼戞伅鏃ュ師鍥狅紝濡傦細鍥藉簡鑺傘�佸懆鍏� */
+ restDayReason?: string;
+ /** 鎵撳崱鍦扮偣鍚嶇О */
+ locationName?: string;
+ locationAddress?: string;
+ /** 鏄惁鍚敤瀹氫綅鑼冨洿鏍¢獙 */
+ locationRequired?: boolean;
+ /** 鍏佽鎵撳崱鍗婂緞锛屽崟浣嶇背 */
+ radiusMeters?: number;
+ /** 褰撴棩鑰冨嫟璁板綍锛屾湭鎵撳崱鏃朵负 null */
+ record?: AttendanceRecord;
+ /** 浠婃棩璁板綍ID */
+ recordId?: number;
+ clockInTime?: string;
+ clockOutTime?: string;
+ clockInType?: number;
+ clockOutType?: number;
+ clockInDone?: boolean;
+ clockOutDone?: boolean;
+ workHours?: number;
+ overtimeHours?: number;
+ location?: string;
+ /** 褰撳ぉ鏄惁璇峰亣 */
+ onLeave?: boolean;
+ /** 褰撳ぉ璇峰亣宸ユ椂锛堝皬鏃讹級锛屾湭璇峰亣涓� 0 */
+ leaveHours?: number;
+ /** 褰撳ぉ璇峰亣绫诲瀷鍚嶇О锛屽娈电敤椤垮彿鍒嗛殧锛屽 "浜嬪亣銆佺梾鍋�" */
+ leaveTypeNames?: string;
+ /** 褰撳墠鍙墦鍗$姸鎬� */
+ clockable?: {
+ clockIn?: boolean;
+ clockOut?: boolean;
+ /** 涓嬩竴姝ュ姩浣滐細in-涓婄彮鎵撳崱锛宱ut-涓嬬彮鎵撳崱锛宯one-鏃犻渶鎵撳崱 */
+ nextAction?: 'in' | 'none' | 'out' | string;
+ /** 鎻愮ず鏂囨 */
+ message?: string;
+ };
}
/** 鑰冨嫟缁熻 */
@@ -41,11 +119,40 @@
}
}
+/** 瀹氫綅鎵撳崱鍧愭爣锛屽悗绔粎鎺ュ彈 WGS84 */
+export interface AttendanceClockLocation {
+ longitude: number;
+ latitude: number;
+ accuracy: number;
+ coordinateSystem: 'WGS84';
+}
+
+/** 瀹氫綅鎵撳崱缁撴灉锛涙湭鍚敤瀹氫綅鑼冨洿鏍¢獙鏃讹紝璺濈涓庡崐寰勪负绌� */
+export interface AttendanceClockResponse {
+ record?: HrmAttendanceRecordApi.AttendanceRecord;
+ locationName?: string;
+ distanceMeters?: number;
+ radiusMeters?: number;
+ withinRange?: boolean;
+}
+
/** 鏌ヨ鑰冨嫟璁板綍鍒嗛〉鍒楄〃 */
export function getAttendanceRecordPage(params: PageParam) {
return requestClient.get<PageResult<HrmAttendanceRecordApi.AttendanceRecord>>(
'/hrm/attendance/record/page',
{ params },
+ );
+}
+
+/**
+ * 鏌ヨ褰撳墠鐧诲綍浜虹殑鑰冨嫟鐘舵��
+ *
+ * @param date 鑰冨嫟鏃ユ湡锛屾牸寮� yyyy-MM-dd锛屼笉浼犲彇鏈嶅姟鍣ㄥ綋澶�
+ */
+export function getAttendanceMyStatus(date?: string) {
+ return requestClient.get<HrmAttendanceRecordApi.AttendanceMyStatus>(
+ '/hrm/attendance/record/my-status',
+ date ? { params: { date } } : undefined,
);
}
@@ -79,25 +186,32 @@
return requestClient.download('/hrm/attendance/record/export-excel', { params });
}
-export interface AttendanceClockLocation {
- longitude: number;
- latitude: number;
- accuracy: number;
- coordinateSystem: 'WGS84';
-}
-
-/** 涓婄彮鎵撳崱 */
-export function clockIn(data: AttendanceClockLocation) {
- return requestClient.post<HrmAttendanceRecordApi.AttendanceRecord>(
+/**
+ * 涓婄彮鎵撳崱
+ *
+ * 鍚屾椂鎻愪氦瀹氫綅锛圝SON body锛変笌鏃х増鍦扮偣鏂囨湰锛坬uery 鍙傛暟锛夛細
+ * - 鏂板悗绔寜瀹氫綅鏍¢獙鎵撳崱鑼冨洿锛屾湭鍚敤瀹氫綅鏃跺拷鐣ュ畾浣嶏紱
+ * - 鏃у悗绔彧璇诲彇 location 鍙傛暟锛屼繚璇佸崌绾у墠鍚庨兘鑳芥甯告墦鍗°��
+ */
+export function clockIn(
+ data?: AttendanceClockLocation | null,
+ location?: string,
+) {
+ return requestClient.post<AttendanceClockResponse>(
'/hrm/attendance/record/clock-in',
- data,
+ data ?? null,
+ location ? { params: { location } } : undefined,
);
}
-/** 涓嬬彮鎵撳崱 */
-export function clockOut(data: AttendanceClockLocation) {
- return requestClient.post<HrmAttendanceRecordApi.AttendanceRecord>(
+/** 涓嬬彮鎵撳崱锛屽弬鏁拌鏄庡悓 clockIn */
+export function clockOut(
+ data?: AttendanceClockLocation | null,
+ location?: string,
+) {
+ return requestClient.post<AttendanceClockResponse>(
'/hrm/attendance/record/clock-out',
- data,
+ data ?? null,
+ location ? { params: { location } } : undefined,
);
}
--
Gitblit v1.9.3