修改统计工作流运行情况和修改统计时间BUG

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java

@@ -761,12 +761,12 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         }
         //如果工作空间下面有数据
         if (flowIdList.size() > 0){
-            StatisticData flowStatisticData = runRecordingMapper.findStatusByStartAndEndTime(startTime, endTime, flowIdList);
+            StatisticData flowStatisticData = runRecordingMapper.findStatusByStartAndEndTime(new Date(startTime), new Date(endTime), flowIdList);
             if (null == flowStatisticData){
                 flowStatisticData = new StatisticData();
                 flowStatisticData.setUnstart(flowList.size());
             }else {
-                Integer sum = runRecordingMapper.findFlowNum(startTime, endTime, flowIdList);
+                Integer sum = runRecordingMapper.findFlowNum(new Date(startTime), new Date(endTime), flowIdList);
                 if (flowList.size() > sum){
                     //如果工作流
                     flowStatisticData.setUnstart(flowList.size() - sum + flowStatisticData.getUnstart());

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

@@ -185,8 +185,8 @@ public interface RunRecordingMapper {
      * @param flowIdList
      * @return
      */
-    StatisticData findStatusByStartAndEndTime(@Param("startTime")Long startTime,
-                                              @Param("endTime")Long endTime,
+    StatisticData findStatusByStartAndEndTime(@Param("startTime")Date startTime,
+                                              @Param("endTime")Date endTime,
                                               @Param("flowIdList")List<Integer> flowIdList);
 
     List<RunRecording> findMaxByFlowId(@Param("flowId")Integer flowId);
@@ -208,7 +208,7 @@ public interface RunRecordingMapper {
 
     int updateState(RunRecording runRecording);
 
-    Integer findFlowNum(@Param("startTime")Long startTime,
-                        @Param("endTime")Long endTime,
+    Integer findFlowNum(@Param("startTime")Date startTime,
+                        @Param("endTime")Date endTime,
                         @Param("flowIdList")List<Integer> flowIdList);
 }
\ No newline at end of file

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

@@ -208,8 +208,8 @@
               sum(case when flow_status='4' and (flow_run_result = '2' or flow_run_result = '4') then 1 else 0 end ) fail,
               sum(case when flow_run_result='5' then 1 else 0 end ) 'kill'
       from run_recording
-        where trigger_time >= #{startTime}
-            and trigger_time <= #{endTime}
+        where start_time >= #{startTime}
+            and start_time <= #{endTime}
             <if test="flowIdList != null">
               and flow_id in (
               <foreach collection="flowIdList" item="flowId" separator=",">
@@ -254,8 +254,8 @@
     from (
       select flow_id
       from run_recording
-      where trigger_time &gt;= #{startTime}
-      and trigger_time &lt;= #{endTime}
+      where start_time &gt;= #{startTime}
+      and start_time &lt;= #{endTime}
       <if test="flowIdList != null">
         and flow_id in (
         <foreach collection="flowIdList" item="flowId" separator=",">