From 1cbf9952dff257482264fb09e49d38b5df97d52e Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 14 八月 2025 15:58:18 +0800 Subject: [PATCH] feat: 接口对接 --- src/services/api/enterpriseEmployee.ts | 33 + src/views/CPersonManage/CPersonManageList.vue | 88 ++-- src/views/CPersonManage/components/CPersonDetailDialog.vue | 71 ++-- .eslintrc-auto-import.json | 1 src/services/api/typings.d.ts | 581 +++++++++++++++++++++++++++++++-- src/services/api/taskUser.ts | 18 + src/services/api/task.ts | 15 src/services/api/index.ts | 8 src/services/api/taskCheckReceive.ts | 75 ++++ src/services/api/userResume.ts | 30 + src/views/System/ModuleManage.vue | 6 auto-imports.d.ts | 4 src/constants/apiEnum.ts | 14 src/services/api/auth.ts | 17 + src/services/api/user.ts | 33 + 15 files changed, 849 insertions(+), 145 deletions(-) diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 07b95ca..3725c7e 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -56,6 +56,7 @@ "EnumTaskUserHireStatusText": true, "EnumTaskUserSignContractStatus": true, "EnumTaskUserSignContractStatusText": true, + "EnumTaskUserSubmitCheckReceiveStatus": true, "EnumUserGender": true, "EnumUserGenderText": true, "EnumUserGenderTextForPerson": true, diff --git a/auto-imports.d.ts b/auto-imports.d.ts index cb3517d..f4b04b9 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -65,6 +65,7 @@ const EnumTaskUserHireStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText'] const EnumTaskUserSignContractStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus'] const EnumTaskUserSignContractStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText'] + const EnumTaskUserSubmitCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus'] const EnumUserGender: typeof import('./src/constants/apiEnum')['EnumUserGender'] const EnumUserGenderText: typeof import('./src/constants/task')['EnumUserGenderText'] const EnumUserGenderTextForPerson: typeof import('./src/constants/task')['EnumUserGenderTextForPerson'] @@ -252,7 +253,7 @@ export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' import('vue') // @ts-ignore - export type { EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum' + export type { EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum' import('./src/constants/apiEnum') // @ts-ignore export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson' @@ -346,6 +347,7 @@ readonly EnumTaskUserHireStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText']> readonly EnumTaskUserSignContractStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus']> readonly EnumTaskUserSignContractStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']> + readonly EnumTaskUserSubmitCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']> readonly EnumUserGender: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserGender']> readonly EnumUserGenderText: UnwrapRef<typeof import('./src/constants/task')['EnumUserGenderText']> readonly EnumUserGenderTextForPerson: UnwrapRef<typeof import('./src/constants/task')['EnumUserGenderTextForPerson']> diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts index 8d03ef1..01db867 100644 --- a/src/constants/apiEnum.ts +++ b/src/constants/apiEnum.ts @@ -161,6 +161,8 @@ export enum EnumTaskCheckReceiveStatus { /**寰呮彁浜� */ WaitSubmit = 10, + /**寰呴獙鏀� */ + WaitCheckReceive = 20, /**宸查獙鏀� */ Completed = 30, } @@ -225,6 +227,18 @@ Refuse = 30, } +/** 浠诲姟楠屾敹鐘舵�� */ +export enum EnumTaskUserSubmitCheckReceiveStatus { + /**寰呮彁浜� */ + WaitSubmit = 10, + /**寰呴獙鏀� */ + WaitCheckReceive = 20, + /**楠屾敹閫氳繃 */ + Success = 30, + /**楠屾敹鏈�氳繃 */ + Fail = 40, +} + /** 鐢ㄦ埛鎬у埆 */ export enum EnumUserGender { /**鐢� */ diff --git a/src/services/api/auth.ts b/src/services/api/auth.ts index 331a423..1a95129 100644 --- a/src/services/api/auth.ts +++ b/src/services/api/auth.ts @@ -81,6 +81,23 @@ }); } +/** 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅 GET /api/user/auth/getEnterpriseLoginInfo */ +export async function getEnterpriseLoginInfo( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseLoginInfoParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseLoginInfoQueryResult>('/api/user/auth/getEnterpriseLoginInfo', { + method: 'GET', + params: { + ...params, + request: undefined, + ...params['request'], + }, + ...(options || {}), + }); +} + /** 鏌ヨ涓汉鐢ㄦ埛鐧诲綍淇℃伅 GET /api/user/auth/getPersonalLoginInfo */ export async function getPersonalLoginInfo( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) diff --git a/src/services/api/enterpriseEmployee.ts b/src/services/api/enterpriseEmployee.ts index 1c915b2..dfe7822 100644 --- a/src/services/api/enterpriseEmployee.ts +++ b/src/services/api/enterpriseEmployee.ts @@ -2,6 +2,21 @@ // @ts-ignore import { request } from '@/utils/request'; +/** 缂栬緫鐏靛伐淇℃伅 POST /api/user/enterpriseEmployee/editEnterpriseEmployee */ +export async function editEnterpriseEmployee( + body: API.EditEnterpriseEmployeeCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/enterpriseEmployee/editEnterpriseEmployee', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 鏌ヨ鐏靛伐璇︽儏 GET /api/user/enterpriseEmployee/getEnterpriseEmployee */ export async function getEnterpriseEmployee( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) @@ -37,3 +52,21 @@ } ); } + +/** 瀵煎叆鐏靛伐淇℃伅 POST /api/user/enterpriseEmployee/importEnterpriseEmployees */ +export async function importEnterpriseEmployees( + body: API.ImportEnterpriseEmployeesCommand, + options?: API.RequestConfig +) { + return request<API.ImportEnterpriseEmployeesCommandResult>( + '/api/user/enterpriseEmployee/importEnterpriseEmployees', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} diff --git a/src/services/api/index.ts b/src/services/api/index.ts index 24135cb..9cabf40 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -3,28 +3,28 @@ // API 鏇存柊鏃堕棿锛� // API 鍞竴鏍囪瘑锛� import * as enterpriseEmployee from './enterpriseEmployee'; +import * as user from './user'; import * as role from './role'; import * as enterprise from './enterprise'; import * as task from './task'; import * as dictionary from './dictionary'; -import * as user from './user'; import * as userResume from './userResume'; import * as auth from './auth'; +import * as taskCheckReceive from './taskCheckReceive'; import * as resource from './resource'; import * as taskUser from './taskUser'; -import * as taskCheckReceive from './taskCheckReceive'; import * as menu from './menu'; export default { enterpriseEmployee, + user, role, enterprise, task, dictionary, - user, userResume, auth, + taskCheckReceive, resource, taskUser, - taskCheckReceive, menu, }; diff --git a/src/services/api/task.ts b/src/services/api/task.ts index b6c19fa..9488ff3 100644 --- a/src/services/api/task.ts +++ b/src/services/api/task.ts @@ -14,6 +14,21 @@ }); } +/** 鏌ヨ寮�鏀句换鍔″垎椤靛垪琛� POST /api/flexjob/task/getOpenTaskInfos */ +export async function getOpenTaskInfos( + body: API.GetOpenTaskInfosQuery, + options?: API.RequestConfig +) { + return request<API.GetTaskInfosQueryResult>('/api/flexjob/task/getOpenTaskInfos', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 鎴戠殑鎶ュ悕鍒嗛〉鍒楄〃 POST /api/flexjob/task/getPersonalApplyTaskInfos */ export async function getPersonalApplyTaskInfos( body: API.GetPersonalApplyTaskInfosQuery, diff --git a/src/services/api/taskCheckReceive.ts b/src/services/api/taskCheckReceive.ts index f290dbd..87c33b3 100644 --- a/src/services/api/taskCheckReceive.ts +++ b/src/services/api/taskCheckReceive.ts @@ -2,7 +2,37 @@ // @ts-ignore import { request } from '@/utils/request'; -/** 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTask */ +/** 浠诲姟楠屾敹 POST /api/flexjob/taskCheckReceive/checkReceiveTask */ +export async function checkReceiveTask( + body: API.CheckReceiveTaskCommand, + options?: API.RequestConfig +) { + return request<string>('/api/flexjob/taskCheckReceive/checkReceiveTask', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 瀵煎嚭楠屾敹璁板綍 POST /api/flexjob/taskCheckReceive/exportTaskCheckReceiveTaskUsers */ +export async function exportTaskCheckReceiveTaskUsers( + body: API.ExportTaskCheckReceiveTaskUsersCommand, + options?: API.RequestConfig +) { + return request<string>('/api/flexjob/taskCheckReceive/exportTaskCheckReceiveTaskUsers', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鏌ヨ楠屾敹浠诲姟璇︽儏 POST /api/flexjob/taskCheckReceive/getCheckReceiveTask */ export async function getCheckReceiveTask( body: API.GetCheckReceiveTaskQuery, options?: API.RequestConfig @@ -20,19 +50,37 @@ ); } -/** 鏌ヨ楠屾敹鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUser */ -export async function getCheckReceiveTaskUser( - body: API.GetCheckReceiveTaskUserQuery, +/** 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTasks */ +export async function getCheckReceiveTasks( + body: API.GetCheckReceiveTasksQuery, options?: API.RequestConfig ) { - return request<API.GetCheckReceiveTaskUserQueryResult>( - '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUser', + return request<API.GetCheckReceiveTasksQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTasks', { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', }, data: body, + ...(options || {}), + } + ); +} + +/** 鏌ヨ楠屾敹鎻愪氦璇︽儏 GET /api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmit */ +export async function getCheckReceiveTaskUserSubmit( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetCheckReceiveTaskUserSubmitParams, + options?: API.RequestConfig +) { + return request<API.GetCheckReceiveTaskUserSubmitQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmit', + { + method: 'GET', + params: { + ...params, + }, ...(options || {}), } ); @@ -55,3 +103,18 @@ } ); } + +/** 浠诲姟鎻愪氦楠屾敹 POST /api/flexjob/taskCheckReceive/submitCheckReceiveTask */ +export async function submitCheckReceiveTask( + body: API.SubmitCheckReceiveTaskCommand, + options?: API.RequestConfig +) { + return request<string>('/api/flexjob/taskCheckReceive/submitCheckReceiveTask', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/src/services/api/taskUser.ts b/src/services/api/taskUser.ts index af03cc7..a23742d 100644 --- a/src/services/api/taskUser.ts +++ b/src/services/api/taskUser.ts @@ -41,6 +41,24 @@ }); } +/** 鏌ヨ搴旇仒鎶ュ悕浜哄憳褰曠敤鐘舵�� GET /api/flexjob/taskUser/getTaskUserHireStatus */ +export async function getTaskUserHireStatus( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetTaskUserHireStatusParams, + options?: API.RequestConfig +) { + return request<API.GetTaskUserHireStatusQueryResult>( + '/api/flexjob/taskUser/getTaskUserHireStatus', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + /** B绔煡璇㈠簲鑱樻姤鍚嶅垎椤靛垪琛ㄤ俊鎭� POST /api/flexjob/taskUser/getTaskUsers */ export async function getTaskUsers(body: API.GetTaskUsersQuery, options?: API.RequestConfig) { return request<API.GetTaskUsersQueryResult>('/api/flexjob/taskUser/getTaskUsers', { diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index 801d496..9256ea7 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -13,6 +13,17 @@ maxDeep?: number; } + interface APIgetCheckReceiveTaskUserSubmitParams { + /** 鎻愪氦Id锛堢敤浜嶣绔鎴风锛� */ + submitId?: string; + /** 浠诲姟Id锛堢敤浜嶤绔皬绋嬪簭缂栬緫鎻愪氦 鍜屾棩鏈熶竴璧蜂紶锛� */ + taskInfoId?: string; + /** 浠诲姟浜哄憳Id锛堢敤浜嶣绔皬绋嬪簭楠屾敹 鍜屾棩鏈熶竴璧蜂紶锛� */ + taskInfoUserId?: string; + /** 鏃ユ湡锛堢敤浜庝袱涓皬绋嬪簭 璺熸煇涓�涓狪d涓�璧蜂紶锛� */ + date?: string; + } + interface APIgetCurrentLogierMenuParams { /** Id */ id?: string; @@ -55,6 +66,11 @@ id?: string; /** 浠诲姟Id */ taskInfoId?: string; + } + + interface APIgetEnterpriseLoginInfoParams { + /** 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅 */ + request?: GetEnterpriseLoginInfoQuery; } interface APIgetEnterpriseParams { @@ -117,6 +133,13 @@ id?: string; } + interface APIgetTaskUserHireStatusParams { + /** 浠诲姟Id */ + taskInfoId?: string; + /** 鐢ㄦ埛Id锛圕绔敤鎴峰彲涓嶅~锛� */ + userId?: string; + } + interface APIgetUserInfoRolesParams { /** 鐢ㄦ埛Id */ userInfoId?: string; @@ -147,6 +170,8 @@ interface APIgetUserResumeParams { /** 鐢ㄦ埛Id */ userId?: string; + /** 鐏靛伐Id */ + enterpriseEmployeeId?: string; } interface APIgetUserResumePersonalParams { @@ -182,11 +207,29 @@ verifyCode: string; } + interface CheckReceiveTaskCommand { + /** 鎻愪氦Id */ + id?: string; + checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus; + } + interface CollectTaskCommand { /** 浠诲姟Id */ ids?: string[]; /** 鏄惁鏀惰棌 */ isCollect?: boolean; + } + + interface CollectUserResumeCommand { + /** 鐢ㄦ埛Id */ + id?: string; + /** 鏄惁宸叉敹钘� */ + isCollected?: boolean; + } + + interface ContactUserResumeCommand { + /** 鐢ㄦ埛Id */ + id?: string; } interface DeleteDictionaryCategoryCommand { @@ -207,6 +250,24 @@ interface DeleteUserResumeCredentialCommand { ids: string[]; + } + + interface EditEnterpriseEmployeeCommand { + /** 濮撳悕 */ + name: string; + /** 韬唤璇佸彿 */ + identity: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber: string; + gender?: EnumUserGender; + /** 骞撮緞 */ + age?: number; + /** 韬唤璇佷汉鍍忛潰 */ + identityImg?: string; + /** 韬唤璇佸浗寰介潰 */ + identityBackImg?: string; + /** Id */ + id?: string; } enum EnumBillingMethod { @@ -355,6 +416,8 @@ enum EnumTaskCheckReceiveStatus { /**寰呮彁浜� */ WaitSubmit = 10, + /**寰呴獙鏀� */ + WaitCheckReceive = 20, /**宸查獙鏀� */ Completed = 30, } @@ -412,6 +475,17 @@ Refuse = 30, } + enum EnumTaskUserSubmitCheckReceiveStatus { + /**寰呮彁浜� */ + WaitSubmit = 10, + /**寰呴獙鏀� */ + WaitCheckReceive = 20, + /**楠屾敹閫氳繃 */ + Success = 30, + /**楠屾敹鏈�氳繃 */ + Fail = 40, + } + enum EnumUserGender { /**鐢� */ Male = 10, @@ -442,6 +516,11 @@ Enterprise = 20, /**杩愯惀 */ Operation = 100, + } + + interface ExportTaskCheckReceiveTaskUsersCommand { + /** 浠诲姟Id */ + id?: string; } interface FriendlyResultBoolean { @@ -517,14 +596,32 @@ timestamp?: number; } - interface FriendlyResultGetCheckReceiveTaskUserQueryResult { + interface FriendlyResultGetCheckReceiveTasksQueryResult { /** 璺熻釜Id */ traceId?: string; /** 鐘舵�佺爜 */ code?: number; /** 閿欒鐮� */ errorCode?: string; - data?: GetCheckReceiveTaskUserQueryResult; + data?: GetCheckReceiveTasksQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetCheckReceiveTaskUserSubmitQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetCheckReceiveTaskUserSubmitQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -597,6 +694,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetEnterpriseEmployeesQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseLoginInfoQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseLoginInfoQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -733,6 +848,42 @@ timestamp?: number; } + interface FriendlyResultGetPersonalUserInfoSignContractsQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetPersonalUserInfoSignContractsQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetPersonalUserInfosQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetPersonalUserInfosQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultGetRoleQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -777,6 +928,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetTaskInfosQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetTaskUserHireStatusQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetTaskUserHireStatusQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -940,6 +1109,24 @@ errorCode?: string; /** 鏁版嵁 */ data?: string; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultImportEnterpriseEmployeesCommandResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: ImportEnterpriseEmployeesCommandResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1248,6 +1435,25 @@ timestamp?: number; } + interface FriendlyResultString { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + /** 鏁版嵁 */ + data?: string; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + type GetAliyunOSSAcsQuery = Record<string, any>; interface GetAliyunOSSAcsQueryResult { @@ -1327,63 +1533,30 @@ } interface GetCheckReceiveTaskQuery { - /** 楠屾敹鏃ユ湡-鏈�鏃╂椂闂� */ - dateBegin?: string; - /** 楠屾敹鏃ユ湡-鏈�鏅氭椂闂� */ - dateEnd?: string; + /** 浠诲姟Id */ + taskInfoId?: string; checkReceiveStatus?: EnumTaskCheckReceiveStatus; + /** 鏃ユ湡锛圔绔皬绋嬪簭涓撶敤锛� */ + date?: string; pageModel?: PagedListQueryPageModel; } interface GetCheckReceiveTaskQueryResult { + objectData?: GetCheckReceiveTaskQueryResultObjectData; pageModel?: PagedListQueryResultPageModel; /** 鏁版嵁 */ data?: GetCheckReceiveTaskQueryResultItem[]; } interface GetCheckReceiveTaskQueryResultItem { - /** 浠诲姟Id */ + /** 浠诲姟浜哄憳Id */ id?: string; /** 浠诲姟鍚嶇О */ - name?: string; - /** 浠诲姟寮�濮嬫椂闂� */ - beginTime?: string; - /** 浠诲姟缁撴潫鏃堕棿 */ - endTime?: string; - /** 浠诲姟鍦扮偣鍚嶇О */ - addressName?: string; - } - - interface GetCheckReceiveTaskUserQuery { - /** 浠诲姟Id */ - taskInfoId?: string; - /** 鍏抽敭瀛� */ - keywords?: string; - /** 楠屾敹鏃ユ湡-鏈�鏃╂椂闂� */ - dateBegin?: string; - /** 楠屾敹鏃ユ湡-鏈�鏅氭椂闂� */ - dateEnd?: string; - checkReceiveStatus?: EnumTaskCheckReceiveStatus; - pageModel?: PagedListQueryPageModel; - } - - interface GetCheckReceiveTaskUserQueryResult { - pageModel?: PagedListQueryResultPageModel; - /** 鏁版嵁 */ - data?: GetCheckReceiveTaskUserQueryResultItem[]; - } - - interface GetCheckReceiveTaskUserQueryResultItem { - /** 浠诲姟Id */ - id?: string; - /** 浠诲姟鍚嶇О */ - taskName?: string; - /** 浠诲姟寮�濮嬫椂闂� */ - beginTime?: string; - /** 浠诲姟缁撴潫鏃堕棿 */ - endTime?: string; - /** 浠诲姟鍦扮偣鍚嶇О */ - addressName?: string; + taskInfoName?: string; + /** 浠诲姟鍗曞彿 */ + taskInfoCode?: string; + /** 澶村儚 */ + avatar?: string; /** 濮撳悕 */ name?: string; /** 韬唤璇佸彿 */ @@ -1393,24 +1566,147 @@ age?: number; /** 鎵嬫満鍙� */ contactPhoneNumber?: string; - /** 鎻愪氦鏃堕棿 */ + /** 鏄惁瀹炲悕 */ + isReal?: boolean; + realMethod?: EnumUserRealMethod; + /** 鏈�杩戞彁浜ゆ椂闂� */ lastSubmitTime?: string; checkReceiveStatus?: EnumTaskCheckReceiveStatus; } - interface GetCheckReceiveTaskUserSubmitsQuery { + interface GetCheckReceiveTaskQueryResultObjectData { + /** 浠诲姟鍚嶇О */ + name?: string; + /** 浠诲姟鍗曞彿 */ + code?: string; + billingMethod?: EnumBillingMethod; + /** 鏈嶅姟璐� */ + serviceFee?: number; + settlementCycle?: EnumSettlementCycle; + /** 浠诲姟寮�濮嬫椂闂� */ + beginTime?: string; + /** 浠诲姟缁撴潫鏃堕棿 */ + endTime?: string; + /** 浠诲姟鍦扮偣鍚嶇О */ + addressName?: string; + } + + interface GetCheckReceiveTasksQuery { + /** 鏃ユ湡锛堝皬绋嬪簭-楠屾敹绠$悊涓撶敤锛� */ + date?: string; + /** 鍏抽敭瀛楋紙濮撳悕/鎵嬫満/韬唤璇佸彿锛� */ + keywords?: string; + /** 楠屾敹鏃ユ湡-鏈�鏃╂椂闂达紙B绔鎴风-楠屾敹绠$悊涓撶敤锛� */ + checkReceiveTimeBegin?: string; + /** 楠屾敹鏃ユ湡-鏈�鏅氭椂闂达紙B绔鎴风-楠屾敹绠$悊涓撶敤锛� */ + checkReceiveTimeEnd?: string; + checkReceiveStatus?: EnumTaskCheckReceiveStatus; + pageModel?: PagedListQueryPageModel; + } + + interface GetCheckReceiveTasksQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetCheckReceiveTasksQueryResultItem[]; + } + + interface GetCheckReceiveTasksQueryResultItem { /** 浠诲姟Id */ id?: string; + /** 浠诲姟鍚嶇О */ + name?: string; + /** 浠诲姟鍗曞彿 */ + code?: string; + billingMethod?: EnumBillingMethod; + /** 鏈嶅姟璐� */ + serviceFee?: number; + settlementCycle?: EnumSettlementCycle; + /** 鍙戝竷鏃堕棿 */ + createdTime?: string; + /** 浠诲姟寮�濮嬫椂闂� */ + beginTime?: string; + /** 浠诲姟缁撴潫鏃堕棿 */ + endTime?: string; + /** 浠诲姟鍦扮偣鍚嶇О */ + addressName?: string; + checkReceiveStatus?: EnumTaskCheckReceiveStatus; + /** 鏈�杩戦獙鏀舵椂闂� */ + lastCheckReceiveTime?: string; + } + + interface GetCheckReceiveTaskUserSubmitQueryResult { + /** 鎻愪氦Id */ + id?: string; + enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser; + /** 鎻愪氦鏃堕棿 */ + createdTime?: string; + /** 楠屾敹鐓х墖 */ + files?: string[]; + } + + interface GetCheckReceiveTaskUserSubmitsQuery { + /** 浠诲姟浜哄憳Id */ + id?: string; + /** 浠诲姟Id */ + taskInfoId?: string; pageModel?: PagedListQueryPageModel; } interface GetCheckReceiveTaskUserSubmitsQueryResult { + objectData?: GetCheckReceiveTaskUserSubmitsQueryResultObjectData; pageModel?: PagedListQueryResultPageModel; /** 鏁版嵁 */ data?: GetCheckReceiveTaskUserSubmitsQueryResultItem[]; } - type GetCheckReceiveTaskUserSubmitsQueryResultItem = Record<string, any>; + interface GetCheckReceiveTaskUserSubmitsQueryResultItem { + /** 鎻愪氦Id */ + id?: string; + /** 鎻愪氦鏃堕棿 */ + createdTime?: string; + /** 楠屾敹鐓х墖 */ + files?: string[]; + checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus; + /** 楠屾敹鏃堕棿 */ + checkReceiveTime?: string; + } + + interface GetCheckReceiveTaskUserSubmitsQueryResultObjectData { + taskInfo?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataTaskInfo; + enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser; + } + + interface GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser { + /** 鐢ㄦ埛Id */ + id?: string; + /** 澶村儚 */ + avatar?: string; + /** 濮撳悕 */ + name?: string; + /** 韬唤璇佸彿 */ + identity?: string; + gender?: EnumUserGender; + /** 骞撮緞 */ + age?: number; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; + /** 鏄惁瀹炲悕 */ + isReal?: boolean; + realMethod?: EnumUserRealMethod; + /** 鏄惁缁戝畾閾惰鍗� */ + isBindBankCard?: boolean; + } + + interface GetCheckReceiveTaskUserSubmitsQueryResultObjectDataTaskInfo { + /** 浠诲姟鍚嶇О */ + name?: string; + /** 浠诲姟寮�濮嬫椂闂� */ + beginTime?: string; + /** 浠诲姟缁撴潫鏃堕棿 */ + endTime?: string; + /** 浠诲姟鍦扮偣鍚嶇О */ + addressName?: string; + } type GetCurrentLogierMenusQuery = Record<string, any>; @@ -1554,6 +1850,8 @@ applyTime?: string; /** 瀹炲悕鏃堕棿 */ userRealTime?: string; + /** 绛剧害鏃堕棿 */ + userSignContractTime?: string; /** 浼佷笟绛剧害鏃堕棿 */ enterpriseSignContractTime?: string; /** 鐢靛瓙鍚堝悓 */ @@ -1627,6 +1925,27 @@ enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; /** 浼佷笟绛剧害鏃堕棿 */ enterpriseSignContractTime?: string; + } + + type GetEnterpriseLoginInfoQuery = Record<string, any>; + + interface GetEnterpriseLoginInfoQueryResult { + /** Id */ + id?: string; + /** 澶村儚 */ + avatar?: string; + /** 濮撳悕 */ + name?: string; + /** 浼佷笟鍏ㄧО */ + enterpriseName?: string; + /** 瑙掕壊 */ + roles?: string[]; + /** 鏄惁瀹炲悕 */ + isReal?: boolean; + /** 鎴戠殑鏀惰棌 */ + collectedUserCount?: number; + /** 鑱旂郴璁板綍 */ + contactedRecordCount?: number; } interface GetEnterpriseQueryResult { @@ -1823,6 +2142,28 @@ remark?: string; } + interface GetOpenTaskInfosQuery { + /** 鍏抽敭瀛楋紙浠诲姟鍚嶇О锛� */ + keywords?: string; + /** 浼佷笟Id */ + enterpriseId?: string; + /** 鍙戝竷鏃堕棿-寮�濮� */ + beginTime?: string; + /** 鍙戝竷鏃堕棿-缁撴潫 */ + endTime?: string; + /** 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙� */ + cityCode?: string; + settlementCycle?: EnumSettlementCycle; + /** 鍛樺伐绂忓埄 */ + benefitCodes?: string[]; + genderLimit?: EnumUserGender; + status?: EnumTaskStatus; + releaseStatus?: EnumTaskReleaseStatus; + recommendStatus?: EnumTaskRecommendStatus; + checkReceiveStatus?: EnumTaskCheckReceiveStatus; + pageModel?: PagedListQueryPageModel; + } + interface GetOperationUserInfosQuery { /** 鍏抽敭瀛� */ keywords?: string; @@ -1975,6 +2316,94 @@ hireRefuseTaskCount?: number; } + interface GetPersonalUserInfoSignContractsQuery { + /** 鐢ㄦ埛Id */ + id?: string; + pageModel?: PagedListQueryPageModel; + } + + interface GetPersonalUserInfoSignContractsQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetPersonalUserInfoSignContractsQueryResultItem[]; + } + + interface GetPersonalUserInfoSignContractsQueryResultItem { + /** 鐏靛伐Id */ + id?: string; + /** 鎵�灞炲晢鎴� */ + enterpriseName?: string; + /** 鎶ュ悕鏃堕棿 */ + applyTime?: string; + hireStatus?: EnumTaskUserHireStatus; + /** 褰曠敤鏃堕棿 */ + hireTime?: string; + userSignContractStatus?: EnumTaskUserSignContractStatus; + enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; + /** 浼佷笟绛剧害鏃堕棿 */ + enterpriseSignContractTime?: string; + /** 鐢靛瓙鍚堝悓 */ + contractUrl?: string; + } + + interface GetPersonalUserInfosQuery { + /** 鍏抽敭瀛楋紙濮撳悕/鎵嬫満/韬唤璇佸彿/瀹㈡埛锛� */ + keywords?: string; + /** 鏈�杩戝綍鐢ㄦ椂闂�-鏈�鏃╂椂闂� */ + hireTimeBegin?: string; + /** 鏈�杩戝綍鐢ㄦ椂闂�-鏈�鏅氭椂闂� */ + hireTimeEnd?: string; + /** 鏈�杩戠绾︽椂闂�-鏈�鏃╂椂闂� */ + signContractBegin?: string; + /** 鏈�杩戠绾︽椂闂�-鏈�鏅氭椂闂� */ + signContractEnd?: string; + /** 鏄惁宸插疄鍚� */ + isReal?: boolean; + pageModel?: PagedListQueryPageModel; + } + + interface GetPersonalUserInfosQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetPersonalUserInfosQueryResultItem[]; + } + + interface GetPersonalUserInfosQueryResultItem { + /** Id */ + id?: string; + /** 濮撳悕 */ + name?: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; + /** 韬唤璇佸彿 */ + identity?: string; + /** 韬唤璇佷汉鍍忛潰 */ + identityImg?: string; + /** 韬唤璇佸浗寰介潰 */ + identityBackImg?: string; + gender?: EnumUserGender; + /** 骞撮緞 */ + age?: number; + /** 甯搁┗鐪佷唤缂栧彿 */ + provinceCode?: string; + /** 甯搁┗鐪佷唤 */ + provinceContent?: string; + /** 甯搁┗鍩庡競缂栧彿 */ + cityCode?: string; + /** 甯搁┗鍩庡競 */ + cityContent?: string; + /** 鎵�灞炲晢鎴� */ + enterprises?: string[]; + /** 鏄惁瀹炲悕 */ + isReal?: boolean; + /** 瀹炲悕鏃堕棿 */ + realTime?: string; + /** 鏈�杩戝綍鐢ㄦ椂闂� */ + hireTime?: string; + /** 鏈�杩戠绾︽椂闂� */ + signContractTime?: string; + } + interface GetResourceFieldsQueryResultItem { /** 缂栧彿 */ code?: string; @@ -2083,6 +2512,8 @@ applyCount?: number; /** 浠诲姟鍚嶇О */ name?: string; + /** 浠诲姟鍗曞彿 */ + code?: string; billingMethod?: EnumBillingMethod; /** 鏈嶅姟璐� */ serviceFee?: number; @@ -2178,6 +2609,8 @@ releaseStatus?: EnumTaskReleaseStatus; recommendStatus?: EnumTaskRecommendStatus; checkReceiveStatus?: EnumTaskCheckReceiveStatus; + /** 鏄惁鏀惰棌 */ + isCollected?: boolean; pageModel?: PagedListQueryPageModel; } @@ -2231,7 +2664,7 @@ checkReceiveStatus?: EnumTaskCheckReceiveStatus; settlementStatus?: EnumTaskSettlementStatus; recommendStatus?: EnumTaskRecommendStatus; - /** 鍒涘缓鏃堕棿 */ + /** 鍙戝竷鏃堕棿 */ createdTime?: string; } @@ -2244,6 +2677,10 @@ inProcessReleaseCount?: number; /** 宸插仠姝㈡暟閲� */ stoppedReleaseCount?: number; + } + + interface GetTaskUserHireStatusQueryResult { + hireStatus?: EnumTaskUserHireStatus; } interface GetTaskUsersQuery { @@ -2264,6 +2701,8 @@ interface GetTaskUsersQueryResultItem { /** 浠诲姟浜哄憳Id */ id?: string; + /** 鐏靛伐Id */ + enterpriseEmployeeId?: string; /** 澶村儚 */ avatar?: string; /** 濮撳悕 */ @@ -2450,6 +2889,8 @@ photos?: string[]; /** 缁忓巻 */ taskInfoUsers?: GetUserResumeQueryResultExperience[]; + /** 鏄惁宸叉敹钘� */ + isCollected?: boolean; } interface GetUserResumeQueryResultCredential { @@ -2505,6 +2946,10 @@ ageMax?: number; /** 璧勬牸璇佷功缂栧彿 */ userCredentials?: string[]; + /** 鏄惁宸叉敹钘� */ + isCollected?: boolean; + /** 鏄惁宸茶仈绯� */ + isContacted?: boolean; pageModel?: PagedListQueryPageModel; } @@ -2546,6 +2991,8 @@ workSeniority?: string; /** 宸ヤ綔缁忛獙 */ workExperience?: string; + /** 鍒涘缓鏃堕棿 */ + createdTime?: string; } type GetUserResumeWorkExperienceQuery = Record<string, any>; @@ -2555,6 +3002,33 @@ workSeniority?: string; /** 宸ヤ綔缁忛獙 */ workExperience?: string; + } + + interface ImportEnterpriseEmployeesCommand { + /** Excel鍦板潃 */ + excelUrl?: string; + } + + interface ImportEnterpriseEmployeesCommandResult { + /** 鎬绘暟 */ + totalCount?: number; + /** 鎴愬姛鏁伴噺 */ + successCount?: number; + /** 澶辫触鏁伴噺 */ + failCount?: number; + /** 閿欒淇℃伅 */ + errors?: ImportEnterpriseEmployeesCommandResultError[]; + } + + interface ImportEnterpriseEmployeesCommandResultError { + /** 閿欒淇℃伅 */ + errorMessage?: string; + /** 濮撳悕 */ + name?: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; + /** 韬唤璇佸彿 */ + identity?: string; } interface LoginCommandCallback { @@ -3080,6 +3554,13 @@ clientType?: EnumClientType; } + interface SubmitCheckReceiveTaskCommand { + /** 浠诲姟Id */ + taskInfoId?: string; + /** 闄勪欢 */ + files?: string[]; + } + type SyncHumanResourcesAreaDictionaryDataCommand = Record<string, any>; interface UpdatePhoneNumberVerifyCodeCommand { diff --git a/src/services/api/user.ts b/src/services/api/user.ts index 3d4e6e0..83fdcbf 100644 --- a/src/services/api/user.ts +++ b/src/services/api/user.ts @@ -20,6 +20,39 @@ ); } +/** 鏌ヨC绔汉鍛樺垎椤靛垪琛ㄦ暟鎹� POST /api/user/user/getPersonalUserInfos */ +export async function getPersonalUserInfos( + body: API.GetPersonalUserInfosQuery, + options?: API.RequestConfig +) { + return request<API.GetPersonalUserInfosQueryResult>('/api/user/user/getPersonalUserInfos', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鏌ヨC绔汉鍛樼绾﹁鎯呭垎椤靛垪琛ㄦ暟鎹� POST /api/user/user/getPersonalUserInfoSignContracts */ +export async function getPersonalUserInfoSignContracts( + body: API.GetPersonalUserInfoSignContractsQuery, + options?: API.RequestConfig +) { + return request<API.GetPersonalUserInfoSignContractsQueryResult>( + '/api/user/user/getPersonalUserInfoSignContracts', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + /** 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃 GET /api/user/user/getUserInfoRoles */ export async function getUserInfoRoles( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) diff --git a/src/services/api/userResume.ts b/src/services/api/userResume.ts index 7b9b8d6..8edd703 100644 --- a/src/services/api/userResume.ts +++ b/src/services/api/userResume.ts @@ -2,6 +2,36 @@ // @ts-ignore import { request } from '@/utils/request'; +/** 鏀惰棌鐏靛伐 POST /api/user/userResume/collectUserResume */ +export async function collectUserResume( + body: API.CollectUserResumeCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/userResume/collectUserResume', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鑱旂郴鐏靛伐 POST /api/user/userResume/contactUserResume */ +export async function contactUserResume( + body: API.ContactUserResumeCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/userResume/contactUserResume', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 鍒犻櫎鐢ㄦ埛绠�鍘�-璧勬牸璇佷功 DELETE /api/user/userResume/deleteUserResumeCredential */ export async function deleteUserResumeCredential( body: API.DeleteUserResumeCredentialCommand, diff --git a/src/views/CPersonManage/CPersonManageList.vue b/src/views/CPersonManage/CPersonManageList.vue index db6d47e..2c64ef9 100644 --- a/src/views/CPersonManage/CPersonManageList.vue +++ b/src/views/CPersonManage/CPersonManageList.vue @@ -18,7 +18,7 @@ </QueryFilterItem> <QueryFilterItem tip-content="鏈�杩戝綍鐢ㄦ椂闂�"> <FieldDatePicker - v-model="extraParamState.createdTime" + v-model="extraParamState.hireTime" type="daterange" range-separator="~" start-placeholder="寮�濮嬫椂闂�" @@ -40,7 +40,7 @@ </QueryFilterItem> <QueryFilterItem> <SearchInput - v-model="extraParamState.searchKeys" + v-model="extraParamState.keywords" style="width: 300px" placeholder="濮撳悕/鎵嬫満/韬唤璇佸彿/瀹㈡埛" @on-click-search="getList" @@ -73,11 +73,10 @@ UploadUserFile, } from '@bole-core/components'; import { useAccess, useGlobalEventContext } from '@/hooks'; -import { Gender } from '@/constants'; import CPersonDetailDialog from './components/CPersonDetailDialog.vue'; import { convertApi2FormUrlOnlyOne, format } from '@/utils'; import { ModelValueType } from 'element-plus'; -import * as enterpriseEmployeeServices from '@/services/api/enterpriseEmployee'; +import * as userServices from '@/services/api/user'; defineOptions({ name: 'CPersonManageList', @@ -123,28 +122,24 @@ } = useTable( async ({ pageIndex, pageSize }, extraParamState) => { try { - let params: API.GetEnterpriseEmployeesQuery = { + let params: API.GetPersonalUserInfosQuery = { pageModel: { rows: pageSize, page: pageIndex, orderInput: extraParamState.orderInput, }, - keywords: extraParamState.searchKeys, - //TODO 搴旇鏄綍鐢ㄦ椂闂� 杩樻病鏈� - createdTimeStart: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'), - createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'), - signContractTimeStart: format( + keywords: extraParamState.keywords, + hireTimeBegin: format(extraParamState.hireTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'), + hireTimeEnd: format(extraParamState.hireTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'), + signContractBegin: format( extraParamState.signContractTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00' ), - signContractTimeEnd: format( - extraParamState.signContractTime?.[1] ?? '', - 'YYYY-MM-DD 23:59:59' - ), + signContractEnd: format(extraParamState.signContractTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'), isReal: extraParamState.isReal, }; - let res = await enterpriseEmployeeServices.getEnterpriseEmployees(params, { + let res = await userServices.getPersonalUserInfos(params, { showLoading: !state.loading, }); return res; @@ -154,67 +149,66 @@ }, { defaultExtraParams: { - searchKeys: '', + keywords: '', orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }], - createdTime: [] as unknown as ModelValueType, + hireTime: [] as unknown as ModelValueType, signContractTime: [] as unknown as ModelValueType, isReal: null as any as boolean, }, - queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees'], + queryKey: ['userServices/getPersonalUserInfos'], columnsRenderProps: { gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson }, - hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText }, - userIsReal: { - formatter: (row: API.GetEnterpriseEmployeesQueryResultItem) => { - return row.userIsReal ? '宸插疄鍚�' : '鏈疄鍚�'; + isReal: { + formatter: (row: API.GetPersonalUserInfosQueryResultItem) => { + return row.isReal ? '宸插疄鍚�' : '鏈疄鍚�'; }, }, - userSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText }, hireTime: { type: 'date' }, - userRealTime: { type: 'date' }, - userSignContractTime: { type: 'date' }, + realTime: { type: 'date' }, + signContractTime: { type: 'date' }, + enterprises: { + formatter: (row: API.GetPersonalUserInfosQueryResultItem) => { + return row.enterprises ? row.enterprises.map((x) => x).join(',') : ''; + }, + }, }, } ); -async function openDialog(row?: API.GetEnterpriseEmployeesQueryResultItem) { - const res = await getUserDetailForBack('98ac4c01-3598-ebf3-fa7d-3a189bb6b587'); +async function openDialog(row?: API.GetPersonalUserInfosQueryResultItem) { + const res = await getPersonalUserInfoSignContracts(row?.id ?? ''); handleEdit({ - userId: row.userId ?? '98ac4c01-3598-ebf3-fa7d-3a189bb6b587', - name: res.name, - idNumber: res.idNumber, - contactPhone: res.contactPhone, - age: res.age, - certificateFrontImgUrl: res.certificateFrontImgUrl - ? convertApi2FormUrlOnlyOne(res.certificateFrontImgUrl) - : [], - certificateBackImgUrl: res.certificateBackImgUrl - ? convertApi2FormUrlOnlyOne(res.certificateBackImgUrl) - : [], + id: row.id ?? '', + name: row.name ?? '', + identity: row.identity ?? '', + contactPhoneNumber: row.contactPhoneNumber, + age: row.age ?? ('' as any as number), + identityImg: row.identityImg ? convertApi2FormUrlOnlyOne(row.identityImg) : [], + identityBackImg: row.identityBackImg ? convertApi2FormUrlOnlyOne(row.identityBackImg) : [], - genderType: Gender.Female, + gender: row.gender, tabType: 'user', }); } const { dialogProps, handleEdit } = useFormDialog({ defaultFormParams: { - userId: '', + id: '', name: '', - idNumber: '', - contactPhone: '', + identity: '', + contactPhoneNumber: '', age: 0, - genderType: '' as any as Gender, - certificateFrontImgUrl: [] as UploadUserFile[], - certificateBackImgUrl: [] as UploadUserFile[], + gender: '' as any as EnumUserGender, + identityImg: [] as UploadUserFile[], + identityBackImg: [] as UploadUserFile[], tabType: '', }, }); -async function getUserDetailForBack(userId: string) { +async function getPersonalUserInfoSignContracts(id: string) { try { - // return await flexEnterpriseWokerServices.getUserDetailForBack({ userId: userId }); + return await userServices.getPersonalUserInfoSignContracts({ id: id }); } catch (error) {} } </script> diff --git a/src/views/CPersonManage/components/CPersonDetailDialog.vue b/src/views/CPersonManage/components/CPersonDetailDialog.vue index ddc2e74..a42d246 100644 --- a/src/views/CPersonManage/components/CPersonDetailDialog.vue +++ b/src/views/CPersonManage/components/CPersonDetailDialog.vue @@ -6,23 +6,26 @@ <ProFormItemV2 label="濮撳悕:" prop="name"> <ProFormText v-model.trim="form.name" /> </ProFormItemV2> - <ProFormItemV2 label="韬唤璇佸彿:" prop="idNumber"> - <ProFormText v-model.trim="form.idNumber" /> + <ProFormItemV2 label="韬唤璇佸彿:" prop="identity"> + <ProFormText v-model.trim="form.identity" /> </ProFormItemV2> - <ProFormItemV2 label="鎵嬫満鍙�:" prop="contactPhone"> - <ProFormText v-model.trim="form.contactPhone" /> + <ProFormItemV2 label="鎵嬫満鍙�:" prop="contactPhoneNumber"> + <ProFormText v-model.trim="form.contactPhoneNumber" /> </ProFormItemV2> - <ProFormItemV2 label="鎬у埆:" prop="age"> - <ProFormRadio v-model="form.genderType" :value-enum="GenderText"></ProFormRadio> + <ProFormItemV2 label="鎬у埆:" prop="gender"> + <ProFormRadio + v-model="form.gender" + :value-enum="EnumUserGenderTextForPerson" + ></ProFormRadio> </ProFormItemV2> <ProFormItemV2 label="骞撮緞:" prop="age"> <ProFormInputNumber v-model="form.age" unit="宀�"></ProFormInputNumber> </ProFormItemV2> - <ProFormItemV2 label="韬唤璇佹闈�:" prop="certificateFrontImgUrl"> - <ProFormImageUpload v-model:file-url="form.certificateFrontImgUrl" /> + <ProFormItemV2 label="韬唤璇佹闈�:" prop="identityImg"> + <ProFormImageUpload v-model:file-url="form.identityImg" /> </ProFormItemV2> - <ProFormItemV2 label="韬唤璇佸弽闈�:" prop="certificateBackImgUrl"> - <ProFormImageUpload v-model:file-url="form.certificateBackImgUrl" /> + <ProFormItemV2 label="韬唤璇佸弽闈�:" prop="identityBackImg"> + <ProFormImageUpload v-model:file-url="form.identityBackImg" /> </ProFormItemV2> </ProForm> </ProTabPane> @@ -59,12 +62,12 @@ defineColumns, } from '@bole-core/components'; import _ from 'lodash'; -import { setOSSLink } from '@/utils'; +import * as userServices from '@/services/api/user'; import { - FlexTaskWorkerHireEnumText, - FlexWorkerEleSignEnumText, - Gender, - GenderText, + EnumUserGender, + EnumUserGenderTextForPerson, + EnumTaskUserHireStatusText, + EnumTaskUserSignContractStatusText, } from '@/constants'; defineOptions({ @@ -73,14 +76,14 @@ type Form = { tabType: string; - userId: string; + id: string; name: string; - idNumber: string; - contactPhone: string; + identity: string; + contactPhoneNumber: string; age: number; - genderType: Gender; - certificateFrontImgUrl: UploadUserFile[]; - certificateBackImgUrl: UploadUserFile[]; + gender: EnumUserGender; + identityImg: UploadUserFile[]; + identityBackImg: UploadUserFile[]; }; const form = defineModel<Form>('form'); @@ -93,7 +96,7 @@ const column = defineColumns([ { id: '1', - enCode: 'enterpirseName', + enCode: 'enterpriseName', name: '鎵�灞炲鎴�', }, { @@ -108,22 +111,22 @@ }, { id: '4', - enCode: 'hireDateTime', + enCode: 'hireTime', name: '褰曠敤鏃堕棿', }, { id: '5', - enCode: 'userSignStatus', + enCode: 'userSignContractStatus', name: '绛剧害鐘舵��', }, { id: '6', - enCode: 'enterSignStatus', + enCode: 'enterpriseSignContractStatus', name: '浼佷笟绛剧害鐘舵��', }, { id: '7', - enCode: 'enterSignTime', + enCode: 'enterpriseSignContractTime', name: '浼佷笟绛剧害鏃堕棿', }, { @@ -150,15 +153,15 @@ } = useTable( async ({ pageIndex, pageSize }, extraParamState) => { try { - let params: API.GetUserClientSignListInput = { + let params: API.GetPersonalUserInfoSignContractsQuery = { pageModel: { rows: pageSize, page: pageIndex, orderInput: extraParamState.orderInput, }, - userId: form.value.userId, + id: form.value.id, }; - let res = await flexEnterpriseWokerServices.getUserClientSignList(params); + let res = await userServices.getPersonalUserInfoSignContracts(params); return res; } catch (error) {} }, @@ -168,11 +171,11 @@ }, columnsRenderProps: { applyTime: { type: 'date' }, - hireDateTime: { type: 'date' }, - userSignTime: { type: 'date' }, - hireStatus: { type: 'enum', valueEnum: FlexTaskWorkerHireEnumText }, - userSignStatus: { type: 'enum', valueEnum: FlexWorkerEleSignEnumText }, - enterSignStatus: { type: 'enum', valueEnum: FlexWorkerEleSignEnumText }, + hireTime: { type: 'date' }, + enterpriseSignContractTime: { type: 'date' }, + hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText }, + userSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText }, + enterpriseSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText }, }, } ); diff --git a/src/views/System/ModuleManage.vue b/src/views/System/ModuleManage.vue index 217df8b..b55268a 100644 --- a/src/views/System/ModuleManage.vue +++ b/src/views/System/ModuleManage.vue @@ -529,7 +529,7 @@ name: subModule.name, group: state.group, // location: 'string', - width: subModule.width, + width: subModule.width.toString(), sort: subModule.sortCode, }; if (subModule.id) { @@ -564,7 +564,7 @@ group.fields = columnModuleList.map((c) => ({ code: c.enCode, name: c.name, - width: c.width, + width: c.width.toString(), sort: c.sortCode, })); } @@ -576,7 +576,7 @@ fields: columnModuleList.map((c) => ({ code: c.enCode, name: c.name, - width: c.width, + width: c.width.toString(), sort: c.sortCode, })), }; -- Gitblit v1.9.1