潘钊 / bsth_control · Commits

Commit 21827025b7e1175d03bb9330b4b5c88fbdb8f3ec

Authored by 王通
1 parent dbba9b8e
build: skipped

1.道闸逻辑修正

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
  View file @2182702
@@ -668,7 +668,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen @@ -668,7 +668,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen
668 sr = isr; 668 sr = isr;
669 break; 669 break;
670 } 670 }
671 - if(fIsOut == 1 && fInStatus != 0 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<bcwcTime))){ 671 + if(fIsOut == 1 && fInStatus != 0 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fInTime)<bcwcTime))){
672 sr = isr; 672 sr = isr;
673 break; 673 break;
674 } 674 }
@@ -690,7 +690,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -690,7 +690,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
690 sr = isr; 690 sr = isr;
691 break; 691 break;
692 } 692 }
693 - if(fIsOut == 1 && fInStatus != 0 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<zcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<zcwcTime))){ 693 + if(fIsOut == 1 && fInStatus != 0 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<zcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fInTime)<zcwcTime))){
694 sr = isr; 694 sr = isr;
695 break; 695 break;
696 } 696 }