Merge remote-tracking branch 'origin/developer' into developer

byit-myth-core/myth-admin-core/src/main/java/com/byit/flowservice/impl/NodeVerificationImpl.java

@@ -79,7 +79,8 @@ public class NodeVerificationImpl implements NodeVerification {
                     filter(jobTaskRunLog -> (
                                 NodeRunStatusPropertyEnum.RUN_FAILURE.getCode().equals(jobTaskRunLog.getRunCode())
                                 || NodeRunStatusPropertyEnum.RE_RUN_FAILURE.getCode().equals(jobTaskRunLog.getRunCode())
-                                || NodeRunStatusPropertyEnum.PARENT_NODE_FAILED.getCode().equals(jobTaskRunLog.getRunCode())))
+                                || NodeRunStatusPropertyEnum.PARENT_NODE_FAILED.getCode().equals(jobTaskRunLog.getRunCode())
+                                || NodeRunStatusPropertyEnum.KILL.getCode().equals(jobTaskRunLog.getRunCode())))
                     .collect(Collectors.toList());
             //当上级节点的失败个数为0时  返回true
             if(CollectionUtil.isEmpty(errorJobLog)){

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/RunRecordingAndJobTaskServiceImpl.java

@@ -123,6 +123,8 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                 .repeatTime(mainRecording.getRepeatTime())
                 .build();
         if(repair) {
+            runRecording.setTriggerTime(mainRecording.getTriggerTime());
+            runRecording.setReRunId(mainRecording.getReRunId());
             runRecording.setOperator(jobTask.getOperator());
             runRecording.setScheduleType(jobTask.getScheduleType());
         }
@@ -247,6 +249,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
             JobTask target = new JobTask();
             target.setTriggerStatus("1");
             target.setRunId(waitingRecord.getRunId());
+            target.setTriggerTime(waitingTask.getTriggerTime());
             BeanUtils.copyProperties(waitingTask, target);
             target.setReRunId(waitingTask.getReRunId());
             target.setId(null);

byit-myth-core/myth-admin-core/src/main/resources/mapper/RunRecordingMapper.xml

@@ -98,12 +98,12 @@
     from run_recording
     where flow_status ='4' and is_alarm = '1' and schedule_type != 4
   </select>
-
+  <!--and is_inner = '1'-->
   <select id="findAllByRunID" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from run_recording
-    where run_id=#{runId,jdbcType=VARCHAR} and is_inner = '1' and schedule_type != 4
+    where run_id=#{runId,jdbcType=VARCHAR} and schedule_type != 4
   </select>
   <!--查询运行中的-->
   <select id="findRunningRunRecording" resultMap="BaseResultMap">