From 09d7bd595c50e5a4d05742477cccbfecfed95d2d Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 15 May 2025 21:43:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtask=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=97=B6=E9=97=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_chain/apps/base/convertor.py | 3 +++ data_chain/entities/response_data.py | 1 + 2 files changed, 4 insertions(+) diff --git a/data_chain/apps/base/convertor.py b/data_chain/apps/base/convertor.py index 703a15a..5af481b 100644 --- a/data_chain/apps/base/convertor.py +++ b/data_chain/apps/base/convertor.py @@ -358,8 +358,10 @@ class Convertor: """将任务实体和任务报告实体转换为任务""" try: task_completed = 0 + finished_time = None if task_report is not None: task_completed = task_report.current_stage/task_report.stage_cnt*100 + finished_time = task_report.finished_time.strftime('%Y-%m-%d %H:%M') task = Task( opId=task_entity.op_id, opName=task_entity.op_name, @@ -367,6 +369,7 @@ class Convertor: taskStatus=TaskStatus(task_entity.status), taskType=TaskType(task_entity.type), taskCompleted=task_completed, + finishedTime=finished_time, createdTime=task_entity.created_time.strftime('%Y-%m-%d %H:%M') ) return task diff --git a/data_chain/entities/response_data.py b/data_chain/entities/response_data.py index 43c7257..37fdbbf 100644 --- a/data_chain/entities/response_data.py +++ b/data_chain/entities/response_data.py @@ -195,6 +195,7 @@ class Task(BaseModel): task_status: TaskStatus = Field(description="任务状态", alias="taskStatus") task_type: TaskType = Field(description="任务类型", alias="taskType") task_completed: float = Field(description="任务完成度", alias="taskCompleted") + finished_time: Optional[str] = Field(default=None, description="任务完成时间", alias="finishedTime") created_time: str = Field(description="任务创建时间", alias="createdTime") -- Gitee From 217e79fff9b92675680783ed508d7d8c09e53dbe Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 15 May 2025 21:46:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E5=88=9B=E5=BB=BAis=5Fpublic=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_chain/entities/request_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_chain/entities/request_data.py b/data_chain/entities/request_data.py index 9685ee1..e76f3c9 100644 --- a/data_chain/entities/request_data.py +++ b/data_chain/entities/request_data.py @@ -50,7 +50,7 @@ class ListTeamUserRequest(BaseModel): class CreateTeamRequest(BaseModel): team_name: str = Field(default='这是一个默认的团队名称', min_length=1, max_length=30, alias="teamName") description: str = Field(default='', max_length=150) - is_public: bool = Field(default=False) + is_public: bool = Field(default=False, alias="isPublic") class UpdateTeamRequest(BaseModel): -- Gitee