wupengfei
2 天以前 6e2f19df7ba33fcfea0af7c2c529c68414c101fb
feat: 接口对接
7个文件已修改
173 ■■■■ 已修改文件
apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/hooks/task.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/index.ts 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/taskCheckReceive.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/typings.d.ts 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/user.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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>
packages/hooks/task.ts
@@ -161,7 +161,7 @@
          rows: 20,
          page: pageParam,
        },
        id: id,
        taskInfoId: id,
      };
      return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {
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,
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,
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;
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(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)