From 7d70014dc650cc43131baa797ed1fd9fcf346753 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Mon, 13 Mar 2023 10:51:23 +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=E6=8B=BC?=
 =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF=EF=BC=8C=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E6=A0=87=E7=82=B9=E7=AC=A6=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/config/SpringContextHolder.java       |  2 +-
 .../plugin/listener/ProcessEndListener.java      | 16 ++++++++--------
 .../service/impl/AutoStartModelServiceImpl.java  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/config/SpringContextHolder.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/config/SpringContextHolder.java
index fff9a34..c072236 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/config/SpringContextHolder.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/config/SpringContextHolder.java
@@ -7,7 +7,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @Description
+ * @Description 手动获取bean
  * @Author ytl
  * @Date 2023/3/2 0002 15:36
  */
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 9905c18..dc74e3d 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
@@ -35,7 +35,7 @@ public class ProcessEndListener implements ExecutionListener {
         Map<String, Object> variablesMap = new HashMap<>();
         variablesMap.putAll(variables);
         ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        HttpServletResponse response = servletRequestAttributes.getResponse();
+//        HttpServletResponse response = servletRequestAttributes.getResponse();
         switch (event) {
             case "start":
                 System.out.println("ProcessEndListener-start event-------------------");
@@ -43,15 +43,15 @@ public class ProcessEndListener implements ExecutionListener {
                 if(variablesMap.containsKey("wf_process_terminate")) return;
 
                 IAutoStartModelService autoStartModelService = (IAutoStartModelService) SpringContextHolder.getBean(AutoStartModelServiceImpl.class);
-                //判断工作流的的重复模式1
+                //判断工作流的的重复模式,重复的任务生成工单、保存任务信息，计算下次任务开始时间
                 if (Func.isNotEmpty(variablesMap.get("chongfumoshi")) && !StringUtils.equals(RepeatEnum.不重复.getCode(), variablesMap.get("chongfumoshi").toString())) {
                     String s = autoStartModelService.saveStartProcess(processInstanceId, variablesMap);
-                    try {
-                        response.sendError(200,s);
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                } else {//不重复任务
+//                    try {
+//                        response.sendError(200,s);
+//                    } catch (IOException e) {
+//                        e.printStackTrace();
+//                    }
+                } else {//不重复任务，生成工单
                     autoStartModelService.newWorkOrder(processInstanceId, variablesMap);
                 }
                 break;
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 e1f7a32..d2f16b0 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
@@ -310,7 +310,7 @@ public class AutoStartModelServiceImpl extends BaseServiceImpl<BladeManMadeMappe
         AutoStartModel autoStartModel = new AutoStartModel();
         autoStartModel.setProcessInstanceId(processinstanceId);
         String chongfumoshi = variables.get("chongfumoshi") == null ? "" : variables.get("chongfumoshi").toString();
-        Date qiwangwanchengshijian = DateUtil.parse(variables.get("qiwangwanchengshijian").toString().substring(0,10) + " 23：59：59", "yyyy-MM-dd HH:mm:ss");
+        Date qiwangwanchengshijian = DateUtil.parse(variables.get("qiwangwanchengshijian").toString().substring(0,10) + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
         Date nextStartTime = this.setStartTime(qiwangwanchengshijian, chongfumoshi);
         //第一次创建工单的开始时间和结束时间都是以工作流的期望结束时间为基准的
         autoStartModel.setNextStartTime(nextStartTime);
@@ -503,7 +503,7 @@ public class AutoStartModelServiceImpl extends BaseServiceImpl<BladeManMadeMappe
             autoStartModel.setNextEndTime(nextEndTime);
             baseMapper.updateById(autoStartModel);
 
-            boolean ii = DateUtil.between(nextStartTime,now).isNegative();
+           // boolean ii = DateUtil.between(nextStartTime,now).isNegative();
 
             if(!DateUtil.between(nextStartTime,now).isNegative()){
                 autoCreateWorkOrder(now,autoStartModel);