修改查询快照条件

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/RunRecordingMapper.java

@@ -174,7 +174,7 @@ public interface RunRecordingMapper {
     RunRecording findMaxByFlowId(@Param("flowId")Integer flowId);
 
     /**
-     * 查询过去一小时的运行实例
+     * 查询过去一个小时的和未完成的工作流实例
      * @param preHourDate
      * @param flowId
      * @return

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/StatusSnapshootThreadRunHelper.java

@@ -86,6 +86,7 @@ public class StatusSnapshootThreadRunHelper extends BaseThreadRunHelper {
                             flowStatusSnapshoot.setUnstartNode(flow.getFlowNodeCount());
                             flowStatusSnapshootList.add(flowStatusSnapshoot);
                         } else { //存在工作流的运行实例
+                            //查询过去一个小时的和未完成的工作流实例
                             List<RunRecording> runRecordingList = runRecordingMapper.findByPreTime(new Date(preHourTime), flow.getFlowId());
                             runRecordingList.forEach(runRecording -> {
                                 FlowStatusSnapshoot hourFlowStatusSnapshoot = new FlowStatusSnapshoot();

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

@@ -181,7 +181,10 @@
     <include refid="Base_Column_List" />
     from run_recording
     where flow_id = #{flowId}
-        and start_time &gt;= #{preHourDate}
+        and (
+            start_time &gt;= #{preHourDate}
+            or flow_status != '4'
+        )
   </select>
 
   <delete id="deleteById" parameterType="java.lang.Integer">