From 6e2f19df7ba33fcfea0af7c2c529c68414c101fb Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 14 八月 2025 10:32:14 +0800
Subject: [PATCH] feat: 接口对接
---
packages/services/apiV2/index.ts | 4
apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue | 4 -
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 25 ++++----
packages/services/apiV2/taskCheckReceive.ts | 15 +++++
packages/services/apiV2/typings.d.ts | 108 ++++++++++++++++++++++++++++++++++-
packages/services/apiV2/user.ts | 15 +++++
packages/hooks/task.ts | 2
7 files changed, 151 insertions(+), 22 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index 9d89fd7..fe8e7ea 100644
--- a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -1,5 +1,5 @@
<template>
- <div class="task-check-card-wrapper" @click.stop="emit('taskChecked')">
+ <div class="task-check-card-wrapper" @click.stop="emit('checkReceive')">
<TaskCheckPersonalView
class="task-check-card-view"
:avatar="avatar"
@@ -13,7 +13,6 @@
v-if="checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive"
type="primary"
class="task-check-card-phone-btn"
- @click.stop="emit('checkReceive')"
>楠屾敹</nut-button
>
<div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
@@ -50,7 +49,6 @@
const emit = defineEmits<{
(e: 'checkReceive'): void;
- (e: 'taskChecked'): void;
}>();
</script>
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index dc40cd9..0bcc458 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -21,8 +21,7 @@
:isReal="item.isReal"
:contactPhoneNumber="item.contactPhoneNumber"
:checkReceiveStatus="item.checkReceiveStatus"
- @checkReceive="goHandleTaskDetail(item)"
- @taskChecked="goTaskCheckedDetail(item)"
+ @checkReceive="goTaskDetail(item)"
/>
</template>
</InfiniteLoading>
@@ -35,6 +34,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import TaskCheckCard from '../components/TaskCheckCard.vue';
import { MyTaskCard } from '@12333/components';
+import { EnumTaskCheckReceiveStatus } from '@12333/constants';
import { setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
@@ -68,15 +68,16 @@
}
);
-function goHandleTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
- Taro.navigateTo({
- url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
- });
-}
-
-function goTaskCheckedDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
- });
+function goTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
+ if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
+ });
+ }
+ if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
+ });
+ }
}
</script>
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index a29fbb1..474681a 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -161,7 +161,7 @@
rows: 20,
page: pageParam,
},
- id: id,
+ taskInfoId: id,
};
return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index ca93bf7..2300abd 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -6,11 +6,11 @@
import * as role from './role';
import * as enterprise from './enterprise';
import * as task from './task';
+import * as taskCheckReceive from './taskCheckReceive';
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 menu from './menu';
@@ -19,11 +19,11 @@
role,
enterprise,
task,
+ taskCheckReceive,
dictionary,
user,
userResume,
auth,
- taskCheckReceive,
resource,
taskUser,
menu,
diff --git a/packages/services/apiV2/taskCheckReceive.ts b/packages/services/apiV2/taskCheckReceive.ts
index cd10e99..87c33b3 100644
--- a/packages/services/apiV2/taskCheckReceive.ts
+++ b/packages/services/apiV2/taskCheckReceive.ts
@@ -17,6 +17,21 @@
});
}
+/** 瀵煎嚭楠屾敹璁板綍 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,
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 7ef9946..a9b5c77 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -163,6 +163,8 @@
interface APIgetUserResumeParams {
/** 鐢ㄦ埛Id */
userId?: string;
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
}
interface APIgetUserResumePersonalParams {
@@ -244,8 +246,6 @@
}
interface EditEnterpriseEmployeeCommand {
- /** 鐏靛伐Id */
- id?: string;
/** 濮撳悕 */
name?: string;
/** 韬唤璇佸彿 */
@@ -259,6 +259,8 @@
identityImg?: string;
/** 韬唤璇佸浗寰介潰 */
identityBackImg?: string;
+ /** Id */
+ id?: string;
}
enum EnumBillingMethod {
@@ -507,6 +509,11 @@
Enterprise = 20,
/**杩愯惀 */
Operation = 100,
+ }
+
+ interface ExportTaskCheckReceiveTaskUsersCommand {
+ /** 浠诲姟Id */
+ id?: string;
}
interface FriendlyResultBoolean {
@@ -824,6 +831,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetPersonalLoginInfoQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetPersonalUserInfosQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetPersonalUserInfosQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -1349,6 +1374,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 {
@@ -1542,6 +1586,8 @@
interface GetCheckReceiveTaskUserSubmitsQuery {
/** 浠诲姟浜哄憳Id */
id?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -1836,9 +1882,9 @@
/** 鏄惁瀹炲悕 */
isReal?: boolean;
/** 鎴戠殑鏀惰棌 */
- collectUsers?: number;
+ collectedUserCount?: number;
/** 鑱旂郴璁板綍 */
- contactRecords?: number;
+ contactedRecordCount?: number;
}
interface GetEnterpriseQueryResult {
@@ -2209,6 +2255,60 @@
hireRefuseTaskCount?: number;
}
+ 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;
+ 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;
diff --git a/packages/services/apiV2/user.ts b/packages/services/apiV2/user.ts
index 3d4e6e0..7e0df87 100644
--- a/packages/services/apiV2/user.ts
+++ b/packages/services/apiV2/user.ts
@@ -20,6 +20,21 @@
);
}
+/** 鏌ヨ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 || {}),
+ });
+}
+
/** 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃 GET /api/user/user/getUserInfoRoles */
export async function getUserInfoRoles(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
--
Gitblit v1.9.1