加工零件统计Sheet页

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java

@@ -159,8 +159,6 @@ public class MesShiftServiceImpl implements IMesShiftService {
         String today = nowTime.substring(0, 10);
         String time = nowTime.substring(11);
 
-        Optional<MesShift> shiftOptional = shiftList.stream().filter(o -> (null != o
-                && !StringUtils.isEmpty(o.getStartTime()) && !StringUtils.isEmpty(o.getEndTime()) && o.getStartTime().compareTo(time) <= 0 && o.getEndTime().compareTo(time) >= 0)).findFirst();
         MesShift shiftOp = null;
         for (MesShift shift : shiftList) {
             if (null == shift || StringUtils.isEmpty(shift.getStartTime()) || StringUtils.isEmpty(shift.getEndTime())) continue;
@@ -178,10 +176,10 @@ public class MesShiftServiceImpl implements IMesShiftService {
         //实际开班时间 比 当天早班的开始时间 小的情况下, 代表的是前一天的班次
         if (nowTime.compareTo(todayStartTime) < 0) {
             String yesterday = calcDay(today, -1);
-            return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), yesterday);
+            return calcShiftTime(shiftOp.getStartTime(), shiftOp.getEndTime(), yesterday);
         } else {
             //当天的班次
-            return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), today);
+            return calcShiftTime(shiftOp.getStartTime(), shiftOp.getEndTime(), today);
         }
 
     }