Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

2 天以前 092fd03a7a4eaf855b1816c38e3f6be552818cc2

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

 apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue

@@ -74,7 +74,10 @@
      url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
    });
  }
  if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive) {
  if (
    item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
    item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitSubmit
  ) {
    Taro.navigateTo({
      url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
    });

 apps/cMiniApp/src/pages/task/InnerPage.vue

@@ -48,7 +48,7 @@
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
  if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitSubmit) {
    Taro.navigateTo({
      url: `${RouterPath.taskSubmitCheck}?id=${item.id}`,
      url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
    });
  }
  if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {

 apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue

@@ -30,17 +30,34 @@

<script setup lang="ts">
import { TaskCard } from '@12333/components';
import { useUserStore } from '@/stores/modules/user';
import { useTaskList } from '@12333/hooks';
import * as taskServices from '@12333/services/apiV2/task';
import * as taskUserServices from '@12333/services/apiV2/taskUser';
import { useInfiniteLoading, useTaskList } from '@12333/hooks';
import Taro from '@tarojs/taro';
import { Message } from '@12333/utils';

defineOptions({
  name: 'InnerPage',
});

const { infiniteLoadingProps } = useTaskList({
  defaultQueryMenuState: {},
});
const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
  ({ pageParam }) => {
    let params: API.GetTaskInfosQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
      },
      isCollected: true,
    };

    return taskServices.getTaskInfos(params, {
      showLoading: false,
    });
  },
  {
    queryKey: ['taskServices/getTaskInfos'],
  }
);

function goTaskDetail(id: string) {
  Taro.navigateTo({
@@ -48,7 +65,18 @@
  });
}

function clearExpiredTask() {}
async function clearExpiredTask() {
  try {
    await Message.confirm({
      message: '确定要清空已失效任务吗？',
    });
    let res = await taskUserServices.clearTaskCollect({});
    if (res) {
      Message.success('清空成功');
      invalidateQueries();
    }
  } catch (error) {}
}
</script>

<style lang="scss">

 apps/cMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue

@@ -25,6 +25,7 @@
import Taro from '@tarojs/taro';
import { goBack } from '@/utils';
import { useQueryClient } from '@tanstack/vue-query';
import dayjs from 'dayjs';

defineOptions({
  name: 'InnerPage',
@@ -32,6 +33,7 @@

const route = Taro.useRouter();
const id = route.params?.id as string;
const date = route.params?.date as string;
const queryClient = useQueryClient();

const form = reactive({
@@ -57,6 +59,7 @@
  try {
    let params: API.SubmitCheckReceiveTaskCommand = {
      taskInfoId: id,
      date: dayjs(date).format('YYYY-MM-DD'),
      files: form.files.map((x) => x.path),
    };
    let res = await taskCheckReceiveServices.submitCheckReceiveTask(params);

 packages/hooks/task.ts

@@ -161,7 +161,7 @@
          rows: 20,
          page: pageParam,
        },
        taskInfoId: id,
        id: id,
      };

      return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {

 packages/services/apiV2/task.ts

@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';

/** 按日期修订任务状态 POST /api/flexjob/task/autoTaskStatusByDate */
export async function autoTaskStatusByDate(
  body: API.AutoTaskStatusByDateCommand,
  options?: API.RequestConfig
) {
  return request<number>('/api/flexjob/task/autoTaskStatusByDate', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

/** 删除任务 DELETE /api/flexjob/task/deleteTaskInfo */
export async function deleteTaskInfo(body: API.DeleteTaskInfoCommand, options?: API.RequestConfig) {
  return request<number>('/api/flexjob/task/deleteTaskInfo', {

 packages/services/apiV2/taskUser.ts

@@ -14,6 +14,21 @@
  });
}

/** 清空已停止的任务收藏 DELETE /api/flexjob/taskUser/clearTaskCollect */
export async function clearTaskCollect(
  body: API.ClearTaskCollectCommand,
  options?: API.RequestConfig
) {
  return request<number>('/api/flexjob/taskUser/clearTaskCollect', {
    method: 'DELETE',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

/** 收藏任务 POST /api/flexjob/taskUser/collectTask */
export async function collectTask(body: API.CollectTaskCommand, options?: API.RequestConfig) {
  return request<number>('/api/flexjob/taskUser/collectTask', {

 packages/services/apiV2/typings.d.ts

@@ -189,6 +189,8 @@
    ids?: string[];
  }

  type AutoTaskStatusByDateCommand = Record<string, any>;

  interface BindWxmpUserInfoCommand {
    /** 访问令牌 */
    accessToken: string;
@@ -212,6 +214,8 @@
    id?: string;
    checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
  }

  type ClearTaskCollectCommand = Record<string, any>;

  interface CollectTaskCommand {
    /** 任务Id */
@@ -3581,6 +3585,8 @@
  interface SubmitCheckReceiveTaskCommand {
    /** 任务Id */
    taskInfoId?: string;
    /** 日期 */
    date?: string;
    /** 附件 */
    files?: string[];
  }