Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

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

@@ -0,0 +1,61 @@
+import type { GroupVO, GroupForm, GroupQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询考勤组基本信息列表
+* @param params
+* @returns 考勤组基本信息列表
+*/
+export function groupList(params?: GroupQuery) {
+  return requestClient.get<PageResult<GroupVO>>('/Property/group/list', { params });
+}
+
+/**
+ * 导出考勤组基本信息列表
+ * @param params
+ * @returns 考勤组基本信息列表
+ */
+export function groupExport(params?: GroupQuery) {
+  return commonExport('/Property/group/export', params ?? {});
+}
+
+/**
+ * 查询考勤组基本信息详情
+ * @param id id
+ * @returns 考勤组基本信息详情
+ */
+export function groupInfo(id: ID) {
+  return requestClient.get<GroupVO>(`/Property/group/${id}`);
+}
+
+/**
+ * 新增考勤组基本信息
+ * @param data
+ * @returns void
+ */
+export function groupAdd(data: GroupForm) {
+  return requestClient.postWithMsg<void>('/Property/group', data);
+}
+
+/**
+ * 更新考勤组基本信息
+ * @param data
+ * @returns void
+ */
+export function groupUpdate(data: GroupForm) {
+  return requestClient.putWithMsg<void>('/Property/group', data);
+}
+
+/**
+ * 删除考勤组基本信息
+ * @param id id
+ * @returns void
+ */
+export function groupRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/Property/group/${id}`);
+}

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

@@ -0,0 +1,69 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface GroupVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 考勤组名称
+   */
+  groupName: string;
+
+  /**
+   * 状态(1:启用,0:禁用)
+   */
+  status: number;
+
+  /**
+   * 考勤类型(0:固定班制,1:排班制)
+   */
+  attendanceType: number;
+
+}
+
+export interface GroupForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 考勤组名称
+   */
+  groupName?: string;
+
+  /**
+   * 状态(1:启用,0:禁用)
+   */
+  status?: number;
+
+  /**
+   * 考勤类型(0:固定班制,1:排班制)
+   */
+  attendanceType?: number;
+
+}
+
+export interface GroupQuery extends PageQuery {
+  /**
+   * 考勤组名称
+   */
+  groupName?: string;
+
+  /**
+   * 状态(1:启用,0:禁用)
+   */
+  status?: number;
+
+  /**
+   * 考勤类型(0:固定班制,1:排班制)
+   */
+  attendanceType?: number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

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

@@ -42,6 +42,10 @@ export function houseChargeAdd(data: HouseChargeForm) {
   return requestClient.postWithMsg<void>('/property/houseCharge', data);
 }
 
+export function houseChargeRefund(data: HouseChargeForm) {
+  return requestClient.postWithMsg<void>('/property/houseCharge/returnFee', data);
+}
+
 /**
  * 更新房屋收费
  * @param data