From 38d1ce5932e7b288dc943fb914d41481a2153517 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 18 Dec 2024 18:37:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20[=E6=95=B0=E6=8D=AE=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5]=E8=B0=83=E6=95=B4=E6=88=91=E7=9A=84=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

'已填报'列表返回项包括已填报完成的已过期任务；
'待填报'增加'已填报数/总数'项；
---
 core/core-frontend/src/locales/en-US.ts                     | 1 +
 core/core-frontend/src/locales/en.ts                        | 1 +
 core/core-frontend/src/locales/tw.ts                        | 1 +
 core/core-frontend/src/locales/zh-CN.ts                     | 1 +
 .../io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java | 6 ++++++
 5 files changed, 10 insertions(+)

diff --git a/core/core-frontend/src/locales/en-US.ts b/core/core-frontend/src/locales/en-US.ts
index 78e95398ca..664ddbbbf8 100644
--- a/core/core-frontend/src/locales/en-US.ts
+++ b/core/core-frontend/src/locales/en-US.ts
@@ -4163,6 +4163,7 @@ export default {
       create_time: 'Creation time',
       rate_type: 'Task delivery mode',
       task_status: 'Task status',
+      task_progress: 'Finished / Total',
       task_name: 'Task name',
       add_task: 'Add task',
       task_remain_time: 'Task validity period',
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 43c45040e9..a1355d6451 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -4204,6 +4204,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       create_time: 'Creation time',
       rate_type: 'Task delivery mode',
       task_status: 'Task status',
+      task_progress: 'Finished / Total',
       task_name: 'Task name',
       add_task: 'Add task',
       task_remain_time: 'Task validity period',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 63c95a973b..6d918f81ed 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -4093,6 +4093,7 @@ export default {
       create_time: '建立時間',
       rate_type: '任務下發模式',
       task_status: '任務狀態',
+      task_progress: '已填報數/總數',
       task_name: '任務名稱',
       add_task: '新增任務',
       task_remain_time: '任務有效期限',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 18628767f1..d73bb383fb 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -4097,6 +4097,7 @@ export default {
       create_time: '创建时间',
       rate_type: '任务下发模式',
       task_status: '任务状态',
+      task_progress: '已填报数/总数',
       task_name: '任务名称',
       add_task: '添加任务',
       task_remain_time: '任务有效期',
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java
index 0d369925a6..4e605142db 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java
@@ -39,4 +39,10 @@ public class DfUserTaskVo implements Serializable {
 
     private String assigner;
 
+    private long totalCount;
+
+    private long finishCount;
+
+    private boolean expired;
+
 }