diff --git a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/job/AlibabaWorkOrderJob.java b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/job/AlibabaWorkOrderJob.java index 28b2069..358ce24 100644 --- a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/job/AlibabaWorkOrderJob.java +++ b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/job/AlibabaWorkOrderJob.java @@ -1,6 +1,7 @@ package com.jeelowcode.module.biz.job; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.db.sql.SqlUtil; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.jeelowcode.module.biz.entity.AlibabaWorkOrder; @@ -54,10 +55,10 @@ public class AlibabaWorkOrderJob implements JobHandler { LocalDateTime maxWorkOrderTime = workOrderService.getMaxWorkOrderTime(); StringBuilder sqlBuilder = new StringBuilder(); if (maxWorkOrderTime == null) { - sqlBuilder.append(buildSql(null, null)); + sqlBuilder.append(buildSql("0", null, null)); } else { LocalDateTime endTime = LocalDateTimeUtil.endOfDay(LocalDateTime.now()); - sqlBuilder.append(buildSql(maxWorkOrderTime, endTime)); + sqlBuilder.append(buildSql(param, maxWorkOrderTime, endTime)); } // 执行SQL查询数据 DataSource dataSource = dataSources.get(ALIBABA_DATASOURCE_NAME); @@ -106,13 +107,14 @@ public class AlibabaWorkOrderJob implements JobHandler { } /** - * 构建查询SQL + * 构建SQL查询语句 * + * @param params 查询参数 * @param startTime 开始时间 * @param endTime 结束时间 - * @return SQL + * @return SQL查询语句 */ - public static String buildSql(LocalDateTime startTime, LocalDateTime endTime) { + public static String buildSql(String params, LocalDateTime startTime, LocalDateTime endTime) { StringBuilder sqlBuilder = new StringBuilder(); sqlBuilder.append("SELECT " + " mwoe.ID AS \"id\", " + @@ -485,7 +487,7 @@ public class AlibabaWorkOrderJob implements JobHandler { " ) " + " )"); // 如果时间参数存在并且合法,则添加时间条件 - if (Objects.nonNull(startTime) && Objects.nonNull(endTime) && startTime.isBefore(endTime)) { + if (StrUtil.equals("1", params) && Objects.nonNull(startTime) && Objects.nonNull(endTime) && startTime.isBefore(endTime)) { String formattedStart = LocalDateTimeUtil.format(startTime, FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); String formattedEnd = LocalDateTimeUtil.format(endTime, FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND); diff --git a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/job/DemoJob.java b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/job/DemoJob.java index 5f5ac58..d5deba9 100644 --- a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/job/DemoJob.java +++ b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/config/job/DemoJob.java @@ -21,6 +21,7 @@ public class DemoJob implements JobHandler { public String execute(String param) { System.out.println("当前租户:" + TenantContextHolder.getTenantId()); List users = adminUserMapper.selectList(); + System.out.println(param); return "用户数量:" + users.size(); }