From cb5fda35f7c54d1de91072576bc4ae77c7a8f249 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Tue, 21 May 2024 18:14:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20QueryWrapper=E8=BF=9E=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=BC=82=E5=90=8D=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/mapper/WorkflowTaskBatchMapper.xml  |  1 +
 .../alarm/listener/JobTaskFailAlarmListener.java |  3 ++-
 .../listener/WorkflowTaskFailAlarmListener.java  |  8 ++++----
 .../web/service/impl/JobBatchServiceImpl.java    | 16 ++++++++--------
 .../service/impl/WorkflowBatchServiceImpl.java   | 14 +++++++-------
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml
index 62a0bffd..dee45f47 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml
@@ -11,6 +11,7 @@
                 JOIN sj_workflow flow ON batch.workflow_id = flow.id
         ${ew.customSqlSegment}
     </select>
+
     <select id="selectWorkflowBatchList"
         resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.WorkflowBatchResponseDO">
         SELECT batch.*,
diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java
index 9b522e72..965962a9 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java
@@ -70,7 +70,8 @@ public class JobTaskFailAlarmListener extends AbstractJobAlarm<JobTaskFailAlarmE
         List<Long> jobTaskBatchIds = Lists.newArrayList(jobTaskBatchId);
         queue.drainTo(jobTaskBatchIds, 200);
         QueryWrapper<JobTaskBatch> wrapper = new QueryWrapper<JobTaskBatch>()
-                .in("a.id", jobTaskBatchIds).eq("a.deleted", 0);
+                .in("batch.id", jobTaskBatchIds)
+                .eq("batch.deleted", 0);
         List<JobBatchResponseDO> jobTaskBatchList = jobTaskBatchMapper.selectJobBatchListByIds(wrapper);
         return AlarmInfoConverter.INSTANCE.toJobAlarmInfos(jobTaskBatchList);
     }
diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java
index 8455a86f..b329ecd6 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java
@@ -14,7 +14,6 @@ import com.aizuda.snailjob.server.common.util.DateUtils;
 import com.aizuda.snailjob.server.job.task.support.alarm.event.WorkflowTaskFailAlarmEvent;
 import com.aizuda.snailjob.template.datasource.persistence.dataobject.WorkflowBatchResponseDO;
 import com.aizuda.snailjob.template.datasource.persistence.mapper.WorkflowTaskBatchMapper;
-import com.aizuda.snailjob.template.datasource.persistence.po.JobTaskBatch;
 import com.aizuda.snailjob.template.datasource.persistence.po.WorkflowTaskBatch;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
@@ -63,9 +62,10 @@ public class WorkflowTaskFailAlarmListener extends AbstractWorkflowAlarm<Workflo
         List<Long> workflowTaskBatchIds = Lists.newArrayList(workflowTaskBatchId);
         queue.drainTo(workflowTaskBatchIds, 200);
 
-        QueryWrapper<WorkflowTaskBatch> wrapper = new QueryWrapper<WorkflowTaskBatch>()
-                .in("a.id", workflowTaskBatchIds).eq("a.deleted", 0);
-        List<WorkflowBatchResponseDO> workflowTaskBatches = workflowTaskBatchMapper.selectWorkflowBatchList(wrapper);
+        List<WorkflowBatchResponseDO> workflowTaskBatches = workflowTaskBatchMapper.selectWorkflowBatchList(
+                new QueryWrapper<WorkflowTaskBatch>()
+                        .in("batch.id", workflowTaskBatchIds)
+                        .eq("batch.deleted", 0));
         return AlarmInfoConverter.INSTANCE.toWorkflowAlarmInfos(workflowTaskBatches);
     }
 
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java
index bdc02aae..eb617edd 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java
@@ -59,14 +59,14 @@ public class JobBatchServiceImpl implements JobBatchService {
         }
 
         QueryWrapper<JobTaskBatch> wrapper = new QueryWrapper<JobTaskBatch>()
-                .eq("a.namespace_id", userSessionVO.getNamespaceId())
-                .eq("a.system_task_type", SyetemTaskTypeEnum.JOB.getType())
-                .eq(queryVO.getJobId() != null, "a.job_id", queryVO.getJobId())
-                .in(CollUtil.isNotEmpty(groupNames), "a.group_name", groupNames)
-                .eq(queryVO.getTaskBatchStatus() != null, "task_batch_status", queryVO.getTaskBatchStatus())
-                .likeRight(StrUtil.isNotBlank(queryVO.getJobName()), "job_name", queryVO.getJobName())
-                .eq("a.deleted", 0)
-                .orderByDesc("a.id");
+                .eq("batch.namespace_id", userSessionVO.getNamespaceId())
+                .eq("batch.system_task_type", SyetemTaskTypeEnum.JOB.getType())
+                .eq(queryVO.getJobId() != null, "batch.job_id", queryVO.getJobId())
+                .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames)
+                .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus())
+                .likeRight(StrUtil.isNotBlank(queryVO.getJobName()), "job.job_name", queryVO.getJobName())
+                .eq("batch.deleted", 0)
+                .orderByDesc("batch.id");
         List<JobBatchResponseDO> batchResponseDOList = jobTaskBatchMapper.selectJobBatchPageList(pageDTO, wrapper);
         List<JobBatchResponseVO> batchResponseVOList = JobBatchResponseVOConverter.INSTANCE.convertList(
                 batchResponseDOList);
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java
index b799a59c..ba0cbfa1 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java
@@ -73,13 +73,13 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
         }
 
         QueryWrapper<WorkflowTaskBatch> wrapper = new QueryWrapper<WorkflowTaskBatch>()
-                .eq("a.namespace_id", userSessionVO.getNamespaceId())
-                .eq(queryVO.getWorkflowId() != null, "a.workflow_id", queryVO.getWorkflowId())
-                .in(CollUtil.isNotEmpty(groupNames), "a.group_name", groupNames)
-                .eq(queryVO.getTaskBatchStatus() != null, "task_batch_status", queryVO.getTaskBatchStatus())
-                .likeRight(StrUtil.isNotBlank(queryVO.getWorkflowName()), "b.workflow_name", queryVO.getWorkflowName())
-                .eq("a.deleted", 0)
-                .orderByDesc("a.id");
+                .eq("batch.namespace_id", userSessionVO.getNamespaceId())
+                .eq(queryVO.getWorkflowId() != null, "batch.workflow_id", queryVO.getWorkflowId())
+                .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames)
+                .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus())
+                .likeRight(StrUtil.isNotBlank(queryVO.getWorkflowName()), "flow.workflow_name", queryVO.getWorkflowName())
+                .eq("batch.deleted", 0)
+                .orderByDesc("batch.id");
         List<WorkflowBatchResponseDO> batchResponseDOList = workflowTaskBatchMapper.selectWorkflowBatchPageList(pageDTO, wrapper);
 
         List<WorkflowBatchResponseVO> batchResponseVOList =