| | |
| | | * |
| | | * @param equipmentId |
| | | * @param validDate |
| | | * @param shiftSubId |
| | | * @return |
| | | */ |
| | | @Override |
| | | public BigDecimal findSpindleRunDuration(String equipmentId, String validDate, String shiftSubId) { |
| | | public BigDecimal findSpindleRunDuration(String equipmentId, String validDate) { |
| | | validDate = validDate.replaceAll("-", ""); |
| | | BigDecimal duration = this.baseMapper.findSpindleRunDuration(equipmentId, validDate, shiftSubId); |
| | | BigDecimal duration = this.baseMapper.findSpindleRunDuration(equipmentId, validDate); |
| | | if (duration != null && duration.compareTo(BigDecimal.ZERO) != 0) { |
| | | return duration.divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP); |
| | | } else { |
| | |
| | | } |
| | | //查询班制班次信息 |
| | | Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(equipment.getEquipmentid(), stringDates); |
| | | if (listMap.isEmpty()) { |
| | | if (listMap == null || listMap.isEmpty()) { |
| | | listMap = new HashMap<>(); |
| | | } |
| | | List<MdcEquipmentStatisticalShiftInfo> resultList = new ArrayList<>(); |