正常误差允许时间

游瑞烽
1 parent d1b96a52
Showing 1 changed file with 4 additions and 4 deletions
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
@@ -685,12 +685,12 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                         ScheduleRealInfo isr = list.get(i);
                         if (list.get(i).isDestroy())
                             continue;
-                        if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<bcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<bcwcTime))){
-                            bcwcTime = Math.abs(isr.getDfsjT()-fOutTime);
+                        if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<zcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<zcwcTime))){
+                            zcwcTime = Math.abs(isr.getDfsjT()-fOutTime);
                             sr = isr;
                         }
-                        if(fIsOut == 1 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<bcwcTime))){
-                            bcwcTime = Math.abs(isr.getZdsjT()-fInTime);
+                        if(fIsOut == 1 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<zcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<zcwcTime))){
+                            zcwcTime = Math.abs(isr.getZdsjT()-fInTime);
                             sr = isr;
                         }
                     }