From 57dc5285e67bcbfaf51d0259ea25b0c7fa6c2298 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 10 Mar 2023 17:04:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=B7=A5=E5=8D=95=E6=97=B6=E6=97=B6=E9=97=B4=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/homepage/service/impl/HomePageServiceImpl.java | 6 ------ .../org/springblade/plugin/listener/ProcessEndListener.java | 2 +- .../springblade/plugin/workbench/entity/AutoStartModel.java | 4 ++-- .../workbench/service/impl/AutoStartModelServiceImpl.java | 4 +++- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java index 0c38d0b..5d09155 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java @@ -2,10 +2,8 @@ package org.springblade.plugin.homepage.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.nacos.shaded.com.google.gson.JsonObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import liquibase.pro.packaged.E; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.flowable.engine.HistoryService; @@ -21,7 +19,6 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.StringUtil; import org.springblade.plugin.homepage.enumutil.TaskTypeColorEnum; import org.springblade.plugin.homepage.enumutil.WorkingStatusEnum; import org.springblade.plugin.homepage.service.IHomePageService; @@ -34,10 +31,7 @@ import org.springblade.system.user.entity.User; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.AsyncResult; import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; import java.time.Duration; - import java.time.LocalDate; import java.util.*; import java.util.concurrent.Future; diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/listener/ProcessEndListener.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/listener/ProcessEndListener.java index 27f1e64..9905c18 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/listener/ProcessEndListener.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/listener/ProcessEndListener.java @@ -47,7 +47,7 @@ public class ProcessEndListener implements ExecutionListener { if (Func.isNotEmpty(variablesMap.get("chongfumoshi")) && !StringUtils.equals(RepeatEnum.不重复.getCode(), variablesMap.get("chongfumoshi").toString())) { String s = autoStartModelService.saveStartProcess(processInstanceId, variablesMap); try { - response.sendError(500,s); + response.sendError(200,s); } catch (IOException e) { e.printStackTrace(); } diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/entity/AutoStartModel.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/entity/AutoStartModel.java index bffb296..6ca04f3 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/entity/AutoStartModel.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/entity/AutoStartModel.java @@ -23,7 +23,7 @@ public class AutoStartModel extends TenantEntity { private String processInstanceId; - private Long processSeconds; + // private Long processSeconds; //发起人id private Long applyUser; @@ -69,7 +69,7 @@ public class AutoStartModel extends TenantEntity { //下次期望结束时间 private Date nextEndTime; //标识，下次任务的表单是否建立 - private Integer nextFlag; + // private Integer nextFlag; /** * 开始时间 */ diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java index 2031205..e1f7a32 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/AutoStartModelServiceImpl.java @@ -503,7 +503,9 @@ public class AutoStartModelServiceImpl extends BaseServiceImpl= 0){ + boolean ii = DateUtil.between(nextStartTime,now).isNegative(); + + if(!DateUtil.between(nextStartTime,now).isNegative()){ autoCreateWorkOrder(now,autoStartModel); } }