Merge branch 'master' into dev-v1.1

wupengfei

7 天以前 55caa87bb4252f8abcafa2b43e0a3dbd3c0e442f

 src/services/api/typings.d.ts

@@ -76,6 +76,8 @@
  interface APIgetEnabledElectronSignSettingsParams {
    /** 企业Id */
    enterpriseId?: string;
    /** 是否查询全部 */
    all?: boolean;
  }

  interface APIgetEnterpriseContractTemplateSelectParams {
@@ -170,6 +172,11 @@
    request?: GetPersonalUserRealResultQuery;
  }

  interface APIgetPersonalUserTransactionParams {
    /** 收支Id */
    id?: string;
  }

  interface APIgetResourceFieldsParams {
    /** Id */
    id?: string;
@@ -200,10 +207,8 @@
  }

  interface APIgetSettlementTaskUsersParams {
    /** 任务Id */
    taskInfoId?: string;
    /** 结算单地址 */
    settlementOrderUrl?: string;
    /** 结算订单Id */
    id?: string;
  }

  interface APIgetTaskEnterpriseParams {
@@ -219,6 +224,17 @@
  interface APIgetTaskSelectParams {
    /** 关键字 */
    keywords?: string;
  }

  interface APIgetTaskSettlementDatesParams {
    /** 任务开始时间 */
    beginTime?: string;
    /** 任务结束时间 */
    endTime?: string;
    /** 结算方式 */
    settlementCycle?: EnumSettlementCycle;
    /** 结算日期 */
    settlementDate?: number;
  }

  interface APIgetTaskUserHireStatusParams {
@@ -422,6 +438,21 @@
    identityBackImg?: string;
    /** Id */
    id?: string;
  }

  interface EditTaskSettlementOrderRosterCommand {
    /** 名单Id */
    id?: string;
    /** 结算金额 */
    settlementAmount: number;
    /** 实发金额 */
    actualSettlementAmount: number;
    /** 收款账户 */
    receiveAccount: string;
    /** 所属银行 */
    bank: string;
    /** 开户支行名称 */
    bankBranch?: string;
  }

  interface ElectronSignCallbackCommand {
@@ -641,26 +672,20 @@
    Stop = 999,
  }

  enum EnumEnterpriseWalletTransactionStatus {
    /**待提交 */
    WaitSubmit = 1,
    /**待支付 */
    WaitPay = 10,
    /**处理中 */
    Dealing = 20,
    /**成功 */
    Success = 30,
    /**退票 */
    Refund = 40,
    /**失败 */
    Fail = 50,
  }

  enum EnumEnterpriseWalletTransactionType {
    /**充值 */
    Recharge = 10,
    /**转账 */
    Transfer = 20,
  }

  enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
    /**灵工待签约 */
    UserWait = 10,
    /**企业待签约 */
    EnterpriseWait = 20,
    /**已签约 */
    Pass = 30,
  }

  enum EnumMenuType {
@@ -738,9 +763,9 @@
  enum EnumPersonalUserRealStatus {
    /**未实名 */
    UnReal = 0,
    /**校验中 */
    /**认证中 */
    Checking = 10,
    /**实名失败 */
    /**认证失败 */
    Fail = 99,
    /**已实名 */
    Real = 100,
@@ -954,8 +979,35 @@
    Operation = 100,
  }

  enum EnumUserWalletTransactionType {
    /**收入 */
    Income = 10,
    /**提现 */
    Withdraw = 20,
  }

  enum EnumWalletTransactionStatus {
    /**待提交 */
    WaitSubmit = 1,
    /**待支付 */
    WaitPay = 10,
    /**处理中 */
    Dealing = 20,
    /**成功 */
    Success = 30,
    /**退票 */
    Refund = 40,
    /**失败 */
    Fail = 50,
  }

  interface ExportTaskCheckReceiveTaskUsersCommand {
    /** 任务Id */
    id?: string;
  }

  interface ExportTaskSettlementOrderRostersCommand {
    /** 结算订单Id */
    id?: string;
  }

@@ -1644,6 +1696,42 @@
    timestamp?: number;
  }

  interface FriendlyResultGetPersonalUserTransactionQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetPersonalUserTransactionQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetPersonalUserTransactionsQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetPersonalUserTransactionsQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetResourceLogsQueryResult {
    /** 跟踪Id */
    traceId?: string;
@@ -2005,6 +2093,24 @@
    timestamp?: number;
  }

  interface FriendlyResultImportTaskSettlementOrderRostersCommandResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: ImportTaskSettlementOrderRostersCommandResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultInt32 {
    /** 跟踪Id */
    traceId?: string;
@@ -2014,6 +2120,25 @@
    errorCode?: string;
    /** 数据 */
    data?: number;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultListDateTime {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    /** 数据 */
    data?: string[];
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
@@ -2641,6 +2766,7 @@
    date?: string;
    /** 提交时间 */
    createdTime?: string;
    checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
    /** 验收照片 */
    files?: string[];
  }
@@ -2945,6 +3071,8 @@

  interface GetEnabledElectronSignSettingsQueryResultItem {
    access?: EnumElectronSignAccess;
    /** 是否禁用 */
    isDisabled?: boolean;
    /** 实名费用 */
    realVerifyCost?: number;
    /** 签约费用 */
@@ -3086,6 +3214,7 @@
    isReal?: boolean;
    userSignContractStatus?: EnumTaskUserSignContractStatus;
    enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
    signContractStatus?: EnumGetEnterpriseEmployeesQuerySignContractStatus;
    pageModel?: PagedListQueryPageModel;
  }

@@ -3288,10 +3417,6 @@
    /** 钱包Id */
    id?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
    /** 协议号 */
    code?: string;
    /** 通道协议号 */
@@ -3303,6 +3428,21 @@
    /** 协议失效时间 */
    invalidTime?: string;
    signStatus?: EnumEnterpriseWalletSignStatus;
    /** 支付宝姓名 */
    name?: string;
    /** 支付宝登录账号 */
    identity?: string;
    scene?: EnumEnterpriseWalletExpandindirectOrderScene;
    /** 转账场景说明 */
    sceneDirections?: string;
    orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
    /** 进件单任务完结时间 */
    taskFinishTime?: string;
    /** 进件单审核不通过原因 */
    riskReviewRemark?: string;
    sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites;
    /** 附件 */
    files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
    expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
  }

@@ -3318,7 +3458,7 @@
    remark?: string;
    /** 订单支付时间 */
    transDate?: string;
    transactionStatus?: EnumEnterpriseWalletTransactionStatus;
    transactionStatus?: EnumWalletTransactionStatus;
  }

  interface GetExceptionLogsQuery {
@@ -3711,6 +3851,9 @@
    contactPhoneNumber?: string;
    /** 是否实名 */
    isReal?: boolean;
    realStatus?: EnumPersonalUserRealStatus;
    /** 实名失败消息 */
    realFailMessage?: string;
    realMethod?: EnumUserRealMethod;
    /** 我的报名 */
    taskCount?: number;
@@ -3718,6 +3861,8 @@
    hirePassTaskCount?: number;
    /** 已取消 */
    hireRefuseTaskCount?: number;
    /** 余额 */
    balance?: number;
  }

  type GetPersonalUserBankCardQuery = Record<string, any>;
@@ -3901,6 +4046,74 @@
    realFailMessage?: string;
    /** 人脸实名认证地址 */
    faceRealUrl?: string;
  }

  interface GetPersonalUserTransactionQueryResult {
    /** 收支Id */
    id?: string;
    type?: EnumUserWalletTransactionType;
    /** 订单号 */
    code?: string;
    /** 企业名称 */
    enterpriseName?: string;
    /** 结算日期 */
    settlementTime?: string;
    /** 结算金额 */
    settlementAmount?: number;
    /** 实发金额/提现金额 */
    amount?: number;
    /** 收款人姓名 */
    receiveName?: string;
    /** 收款账户 */
    receiveAccount?: string;
    /** 服务费 */
    serviceFee?: number;
    /** 实际到账 */
    actualAmount?: number;
    /** 预计到账时间 */
    arrivalTimeEnd?: string;
    /** 订单支付时间 */
    transDate?: string;
    /** 创建时间 */
    createdTime?: string;
    /** 失败原因 */
    failReason?: string;
  }

  interface GetPersonalUserTransactionsQuery {
    /** 创建时间-起始 */
    createdTimeStart?: string;
    /** 创建时间-截止 */
    createdTimeEnd?: string;
    type?: EnumUserWalletTransactionType;
    pageModel?: PagedListQueryPageModel;
  }

  interface GetPersonalUserTransactionsQueryResult {
    objectData?: GetPersonalUserTransactionsQueryResultObjectData;
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetPersonalUserTransactionsQueryResultItem[];
  }

  interface GetPersonalUserTransactionsQueryResultItem {
    /** 收支Id */
    id?: string;
    /** 标题 */
    title?: string;
    /** 创建时间 */
    createdTime?: string;
    /** 金额 */
    amount?: number;
    /** 余额 */
    balance?: number;
  }

  interface GetPersonalUserTransactionsQueryResultObjectData {
    /** 总收入 */
    sumIncome?: number;
    /** 总提现 */
    sumWithdraw?: number;
  }

  interface GetResourceFieldsQueryResultItem {
@@ -4089,6 +4302,10 @@
    keywords?: string;
    settlementOrderStatus?: EnumTaskSettlementOrderStatus;
    settlementStatus?: EnumTaskSettlementStatus;
    /** 结算时间-起始 */
    settlementTimeBegin?: string;
    /** 结算时间-截止 */
    settlementTimeEnd?: string;
    pageModel?: PagedListQueryPageModel;
  }

@@ -4100,6 +4317,40 @@

  interface GetSettlementTasksQueryResultItem {
    /** 任务Id */
    id?: string;
    /** 所属任务 */
    name?: string;
    /** 任务单号 */
    code?: string;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
    settlementOrderStatus?: EnumTaskSettlementOrderStatus;
    /** 结算单名称 */
    settlementOrderName?: string;
    /** 上传时间 */
    settlementOrderTime?: string;
    /** 实发金额 */
    actualSettlementAmount?: number;
    /** 结算金额 */
    settlementAmount?: number;
    settlementStatus?: EnumTaskSettlementStatus;
    /** 创建时间 */
    createdTime?: string;
    /** 结算时间 */
    settlementTime?: string;
    /** 备注 */
    settlementRemark?: string;
    /** 结算人数 */
    settlementUserCount?: number;
  }

  interface GetSettlementTaskUsersQueryResult {
    detail?: GetSettlementTaskUsersQueryResultDetail;
    /** 结算名单 */
    data?: GetSettlementTaskUsersQueryResultItem[];
  }

  interface GetSettlementTaskUsersQueryResultDetail {
    /** 结算订单Id */
    id?: string;
    /** 任务名称 */
    name?: string;
@@ -4119,40 +4370,10 @@
    settlementTime?: string;
    /** 备注 */
    settlementRemark?: string;
    /** 结算人数 */
    settlementUserCount?: number;
  }

  interface GetSettlementTaskUsersQueryResult {
    /** 结算名单 */
    data?: GetSettlementTaskUsersQueryResultItem[];
    /** 错误信息 */
    errors?: GetSettlementTaskUsersQueryResultError[];
  }

  interface GetSettlementTaskUsersQueryResultError {
    /** 错误信息 */
    errorMessage?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
    identity?: string;
    /** 结算金额 */
    settlementAmount?: number;
    /** 实发金额 */
    actualSettlementAmount?: number;
    /** 收款账户 */
    receiveAccount?: string;
    /** 所属银行 */
    bank?: string;
    /** 开户支行名称 */
    bankBranch?: string;
    /** 任务名称 */
    taskName?: string;
  }

  interface GetSettlementTaskUsersQueryResultItem {
    /** 任务用户Id */
    /** 结算名单Id */
    id?: string;
    /** 姓名 */
    name?: string;
@@ -4160,7 +4381,6 @@
    identity?: string;
    /** 手机号 */
    contactPhoneNumber?: string;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
    settlementStatus?: EnumTaskSettlementStatus;
    /** 所属银行 */
    bank?: string;
@@ -4220,6 +4440,8 @@
    /** 服务费 */
    serviceFee?: number;
    settlementCycle?: EnumSettlementCycle;
    /** 结算日期 */
    settlementDate?: number;
    /** 福利 */
    benefits?: GetTaskInfoQueryResultBenefit[];
    /** 年龄范围最小 */
@@ -4372,7 +4594,6 @@
    endTime?: string;
    releaseStatus?: EnumTaskReleaseStatus;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
    settlementStatus?: EnumTaskSettlementStatus;
    recommendStatus?: EnumTaskRecommendStatus;
    /** 推荐时间 */
    recommendTime?: string;
@@ -4763,6 +4984,58 @@
    identity?: string;
  }

  interface ImportTaskSettlementOrderRostersCommand {
    /** 结算订单Id */
    id?: string;
    /** 导入文件地址 */
    url: string;
  }

  interface ImportTaskSettlementOrderRostersCommandResult {
    /** Id */
    id?: string;
    /** 任务名称 */
    name?: string;
    /** 任务单号 */
    code?: string;
    settlementOrderStatus?: EnumTaskSettlementOrderStatus;
    /** 结算单名称 */
    settlementOrderName?: string;
    /** 上传时间 */
    settlementOrderTime?: string;
    /** 实发金额 */
    actualSettlementAmount?: number;
    /** 结算金额 */
    settlementAmount?: number;
    settlementStatus?: EnumTaskSettlementStatus;
    /** 结算时间 */
    settlementTime?: string;
    /** 备注 */
    settlementRemark?: string;
    errors?: ImportTaskSettlementOrderRostersCommandResultError[];
  }

  interface ImportTaskSettlementOrderRostersCommandResultError {
    /** 错误信息 */
    errorMessage?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
    identity?: string;
    /** 结算金额 */
    settlementAmount?: number;
    /** 实发金额 */
    actualSettlementAmount?: number;
    /** 收款账户 */
    receiveAccount?: string;
    /** 所属银行 */
    bank?: string;
    /** 开户支行名称 */
    bankBranch?: string;
    /** 任务名称 */
    taskName?: string;
  }

  interface InviteElectronSignCommand {
    /** 灵工Id */
    ids?: string[];
@@ -4787,10 +5060,6 @@
    /** 企业Id */
    enterpriseId?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
  }

  interface OpenEnterpriseWalletCommandResult {
@@ -5242,6 +5511,8 @@
    /** 服务费 */
    serviceFee: number;
    settlementCycle: EnumSettlementCycle;
    /** 结算日期 */
    settlementDate: number;
    /** 福利编号 */
    benefits?: string[];
    /** 年龄范围最小 */
@@ -5367,6 +5638,8 @@
  interface SendInviteElectronSignSmsCommand {
    /** Id */
    ids?: string[];
    /** 合同模板Id */
    contractTemplateId?: string;
  }

  interface SendLoginOrRegisterVerifyCodeCommand {
@@ -5498,32 +5771,6 @@
    taskInfoId?: string;
  }

  interface SureTaskSettlementOrderCommand {
    /** 任务Id */
    taskInfoId?: string;
    /** 结算单地址 */
    settlementOrderUrl?: string;
    /** 结算名单 */
    taskInfoUsers?: SureTaskSettlementOrderCommandUser[];
  }

  interface SureTaskSettlementOrderCommandUser {
    /** 任务用户Id */
    id?: string;
    /** 姓名 */
    name?: string;
    /** 所属银行 */
    bank?: string;
    /** 开户支行名称 */
    bankBranch?: string;
    /** 收款账户 */
    receiveAccount: string;
    /** 结算金额 */
    settlementAmount: number;
    /** 实发金额 */
    actualSettlementAmount: number;
  }

  type SyncDatabaseCommand = Record<string, any>;

  interface SyncElectronSignSettingsCommand {
@@ -5646,14 +5893,6 @@
    industrialParkIds?: string[];
    status?: EnumUserStatus;
    /** 备注 */
    remark?: string;
  }

  interface TransferEnterpriseWalletCommand {
    access?: EnumEnterpriseWalletAccess;
    /** 金额 */
    amount?: number;
    /** 充值备注 */
    remark?: string;
  }