From 226b192f3b4affc250e7b2ad9ca1e5aad4722b43 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 7 May 2025 17:43:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1416017803182080]工单步骤完成后,步骤开始时间为空 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1416017803182080 --- .../process/dao/mapper/processtask/ProcessTaskMapper.java | 2 ++ .../process/dao/mapper/processtask/ProcessTaskMapper.xml | 8 ++++++++ .../stephandler/component/AutomaticProcessComponent.java | 1 + .../stephandler/component/TimerProcessComponent.java | 1 + 4 files changed, 12 insertions(+) diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java index bc4384504..c7cc4092e 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java @@ -488,6 +488,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { int updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo); + int updateProcessTaskStepIsActive(ProcessTaskStepVo processTaskStepVo); + int updateProcessTaskStatus(ProcessTaskVo processTaskVo); // int updateProcessTaskStepRelIsHit(@Param("fromProcessTaskStepId") Long fromProcessTaskStepId, @Param("toProcessTaskStepId") Long toProcessTaskStepId, @Param("isHit") Integer isHit); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml index e30665f5e..50cfc834a 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml @@ -2937,6 +2937,14 @@ WHERE `id` = #{id} + + UPDATE + `processtask_step` + SET + `is_active` = #{isActive} + WHERE `id` = #{id} + + INSERT INTO `processtask_step_audit_detail` (`audit_id`, diff --git a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java index 8466e6086..6daf8c087 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/AutomaticProcessComponent.java @@ -113,6 +113,7 @@ public class AutomaticProcessComponent extends ProcessStepHandlerBase { @Override protected int myActive(ProcessTaskStepVo currentProcessTaskStepVo) throws ProcessTaskException { currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); + currentProcessTaskStepVo.setUpdateStartTime(1); try { AutomaticConfigVo automaticConfigVo = processTaskAutomaticService.getAutomaticConfigVoByProcessTaskStepId(currentProcessTaskStepVo.getId()); JSONObject requestAudit = new JSONObject(); diff --git a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java index f1633512a..37de688f7 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java @@ -131,6 +131,7 @@ public class TimerProcessComponent extends ProcessStepHandlerBase { @Override protected int myActive(ProcessTaskStepVo currentProcessTaskStepVo) throws ProcessTaskException { currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); + currentProcessTaskStepVo.setUpdateStartTime(1); try { String configHash = currentProcessTaskStepVo.getConfigHash(); String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(configHash); -- Gitee