From a5c976314d151c00dd66a3772aa3b793b81d31e8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 17:29:33 +0800
Subject: [PATCH] fix: bug
---
packages/hooks/task.ts | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 6 deletions(-)
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index c7fde27..3480293 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -13,6 +13,7 @@
import { MaybeRef, reactive, ref, unref } from 'vue';
import * as taskServices from '@12333/services/apiV2/task';
import dayjs from 'dayjs';
+import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
export enum HomeOrderType {
Recommend = 'Recommend',
@@ -35,6 +36,9 @@
};
};
+/**
+ * @description 浠匔绔娇鐢�
+ */
export function useTaskList(options: UseTaskListOptions = {}) {
const { cityCode = '', enabled = true, defaultQueryMenuState = {} } = options;
@@ -68,10 +72,13 @@
rows: 20,
page: pageParam,
orderInput: [
- queryState.orderType === HomeOrderType.Recommend
- ? { property: 'recommendStatus', order: EnumPagedListOrder.Desc }
- : { property: 'createdTime', order: EnumPagedListOrder.Desc },
- ],
+ { property: 'releaseStatus', order: EnumPagedListOrder.Asc },
+ queryState.orderType === HomeOrderType.Recommend && {
+ property: 'recommendTime',
+ order: EnumPagedListOrder.Desc,
+ },
+ { property: 'createdTime', order: EnumPagedListOrder.Desc },
+ ].filter(Boolean),
},
keywords: queryState.searchValueTrim,
cityCode: unref(cityCode),
@@ -90,12 +97,12 @@
: '',
};
- return taskServices.getTaskInfos(params, {
+ return taskServices.getOpenTaskInfos(params, {
showLoading: false,
});
},
{
- queryKey: ['taskServices/getTaskInfos', queryState, queryMenuState, cityCode],
+ queryKey: ['taskServices/getOpenTaskInfos', queryState, queryMenuState, cityCode],
enabled: enabled,
}
);
@@ -109,3 +116,67 @@
invalidateQueries,
};
}
+
+export function useCheckReceiveTasks() {
+ const queryState = reactive({
+ date: dayjs().toDate(),
+ checkReceiveStatus: EnumTaskCheckReceiveStatus.WaitSubmit,
+ });
+
+ const { infiniteLoadingProps } = useInfiniteLoading(
+ ({ pageParam }) => {
+ let params: API.GetCheckReceiveTasksQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ },
+ date: dayjs(queryState.date).format('YYYY-MM-DD'),
+ checkReceiveStatus: queryState.checkReceiveStatus,
+ };
+
+ return taskCheckReceiveServices.getCheckReceiveTasks(params, {
+ showLoading: false,
+ });
+ },
+ {
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTasks', queryState],
+ }
+ );
+
+ return {
+ queryState,
+ infiniteLoadingProps,
+ };
+}
+
+type UseCheckReceiveTaskUserSubmitsOptions = {
+ id?: string;
+};
+
+export function useCheckReceiveTaskUserSubmits(
+ options: UseCheckReceiveTaskUserSubmitsOptions = {}
+) {
+ const { id } = options;
+ const { infiniteLoadingProps } = useInfiniteLoading(
+ ({ pageParam }) => {
+ let params: API.GetCheckReceiveTaskUserSubmitsQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ },
+ taskInfoId: id,
+ };
+
+ return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {
+ showLoading: false,
+ });
+ },
+ {
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmits'],
+ }
+ );
+
+ return {
+ infiniteLoadingProps,
+ };
+}
--
Gitblit v1.9.1