From a69bf92c8907eb1fed227afb156ff0e1c5821c24 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 16:16:12 +0800
Subject: [PATCH] fix: bug

---
 packages/hooks/task.ts |   89 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index bac7643..3480293 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -2,6 +2,7 @@
 import {
   EnumPagedListOrder,
   EnumSettlementCycle,
+  EnumTaskCheckReceiveStatus,
   EnumTaskRecommendStatus,
   EnumTaskReleaseStatus,
   EnumTaskStatus,
@@ -12,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',
@@ -27,12 +29,16 @@
     status?: EnumTaskStatus;
     genderLimit?: EnumUserGender;
     settlementCycle?: EnumSettlementCycle;
+    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
     benefitCodes?: string;
     enterpriseId?: string;
     time?: Date;
   };
 };
 
+/**
+ * @description 浠匔绔娇鐢�
+ */
 export function useTaskList(options: UseTaskListOptions = {}) {
   const { cityCode = '', enabled = true, defaultQueryMenuState = {} } = options;
 
@@ -43,7 +49,8 @@
     settlementCycle: '' as any as EnumSettlementCycle,
     benefitCodes: '',
     status: '' as any as EnumTaskStatus,
-    releaseStatus: EnumTaskReleaseStatus.InProcess,
+    releaseStatus: '' as any as EnumTaskReleaseStatus,
+    checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus,
     enterpriseId: '',
     time: '' as any as Date,
     ...defaultQueryMenuState,
@@ -65,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),
@@ -77,6 +87,7 @@
         genderLimit: queryMenuState.genderLimit,
         status: queryMenuState.status,
         releaseStatus: queryMenuState.releaseStatus,
+        checkReceiveStatus: queryMenuState.checkReceiveStatus,
         enterpriseId: queryMenuState.enterpriseId,
         beginTime: queryMenuState.time
           ? dayjs(queryMenuState.time).format('YYYY-MM-DD 00:00:00')
@@ -86,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,
     }
   );
@@ -105,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