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; + }