1、考勤组排班

apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/index.ts

@@ -59,3 +59,12 @@ export function groupUpdate(data: GroupForm) {
 export function groupRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/Property/group/${id}`);
 }
+
+/**
+ * 获取节假日数据
+ * @param year
+ */
+export async function getHoliday(year: string) {
+  const response = await fetch(`https://timor.tech/api/holiday/year/${year}`);
+  return response.json();
+}

apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts

@@ -1,4 +1,4 @@
-import type { PageQuery, BaseEntity } from '#/api/common';
+import type {PageQuery, BaseEntity} from '#/api/common';
 
 export interface GroupVO {
   /**
@@ -63,7 +63,16 @@ export interface GroupQuery extends PageQuery {
   attendanceType?: number;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
 }
+
+/**
+ * 假期
+ */
+export interface Holiday {
+  holiday: boolean;
+  name: string;
+  date: string;
+}

apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts

@@ -58,6 +58,8 @@ export interface HouseChargeVO {
   costItemsVo: CostItemSettingVO;
 
   chargeStatus: string;
+
+  personId: string;
 }
 
 export interface HouseChargeForm extends BaseEntity {