Commit bfb2b25361a2c17018342b5135855fd5bbab7cac
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<D60, Integer> implemen | @@ -685,12 +685,12 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen | ||
| 685 | ScheduleRealInfo isr = list.get(i); | 685 | ScheduleRealInfo isr = list.get(i); |
| 686 | if (list.get(i).isDestroy()) | 686 | if (list.get(i).isDestroy()) |
| 687 | continue; | 687 | continue; |
| 688 | - if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<bcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<bcwcTime))){ | ||
| 689 | - bcwcTime = Math.abs(isr.getDfsjT()-fOutTime); | 688 | + if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<zcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<zcwcTime))){ |
| 689 | + zcwcTime = Math.abs(isr.getDfsjT()-fOutTime); | ||
| 690 | sr = isr; | 690 | sr = isr; |
| 691 | } | 691 | } |
| 692 | - if(fIsOut == 1 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<bcwcTime))){ | ||
| 693 | - bcwcTime = Math.abs(isr.getZdsjT()-fInTime); | 692 | + if(fIsOut == 1 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<zcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<zcwcTime))){ |
| 693 | + zcwcTime = Math.abs(isr.getZdsjT()-fInTime); | ||
| 694 | sr = isr; | 694 | sr = isr; |
| 695 | } | 695 | } |
| 696 | } | 696 | } |