From 4487f4e97a695055ef50404db319a97b65317974 Mon Sep 17 00:00:00 2001
From: even <827656971@qq.com>
Date: Fri, 6 Jun 2025 12:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ci/process/dal/req/history/PipelineHistoryQueryReq.java  | 5 +++--
 .../cd/casic/ci/process/engine/worker/base/BaseWorker.java   | 2 +-
 .../service/history/impl/PipelineHistoryServiceImpl.java     | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java
index c51ad5e1..90436a8a 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/history/PipelineHistoryQueryReq.java
@@ -2,9 +2,10 @@ package cd.casic.ci.process.dal.req.history;
 
 import cd.casic.framework.commons.pojo.PageParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class PipelineHistoryQueryReq {
+public class PipelineHistoryQueryReq extends PageParam{
     private String pipelineId;
-    private PageParam pageParam;
 }
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java
index f1dedc45..13341f95 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/base/BaseWorker.java
@@ -63,7 +63,6 @@ public abstract class BaseWorker implements Runnable{
         BaseRunContext context = contextManager.getContext(contextKey);
         if (context instanceof TaskRunContext taskRunContext){
             try {
-                taskRunContext.changeContextState(ContextStateEnum.READY);
                 Map<String, Object> globalVariables = context.getGlobalVariables();
                 Object fromError = globalVariables.get(PipelineBehaviorConstant.PIPELINE_EXECUTE_FROM_ERROR);
                 if (Boolean.TRUE.equals(fromError)&&ContextStateEnum.HAPPY_ENDING.getCode().equals(taskRunContext.getState().get())) {
@@ -73,6 +72,7 @@ public abstract class BaseWorker implements Runnable{
                         taskRunContext.changeContextState(ContextStateEnum.SUSPEND);
                         passableWorker.waitForPermission();
                     } else {
+                        taskRunContext.changeContextState(ContextStateEnum.READY);
                         taskRunContext.changeContextState(ContextStateEnum.RUNNING);
                     }
                     execute(taskRunContext);
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java
index 34cd5973..07b3932e 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/history/impl/PipelineHistoryServiceImpl.java
@@ -8,6 +8,7 @@ import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance;
 import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
 import cd.casic.ci.process.process.service.history.PipelineHistoryService;
 import cd.casic.ci.process.process.service.pipeline.PipelineService;
+import cd.casic.framework.commons.pojo.PageParam;
 import cd.casic.framework.commons.pojo.PageResult;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,7 +26,8 @@ public class PipelineHistoryServiceImpl extends ServiceImpl<PipPipelineHisInstan
     public PageResult<PipPipelineHisInstance> getPageByPipelineId(PipelineHistoryQueryReq req) {
         LambdaQueryWrapper<PipPipelineHisInstance> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PipPipelineHisInstance::getPipelineId,req.getPipelineId());
-        Page<PipPipelineHisInstance> page = pipelineHisInstanceDao.selectPage(new Page<PipPipelineHisInstance>(), wrapper);
+        wrapper.orderByDesc(PipPipelineHisInstance::getCreateTime);
+        Page<PipPipelineHisInstance> page = pipelineHisInstanceDao.selectPage(new Page<>(req.getPageNo(),req.getPageSize()), wrapper);
         return new PageResult<PipPipelineHisInstance>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
     }
 }