| | |
|---|
| | | List<MdcEquipmentRunningSection> errs = loadEquipmentErrorTrace(equipmentRunningSectionVo.getEquipmentId(), equipmentRunningSectionVo.getCollectTimeStr()); |
|---|
| | | if (!running.isEmpty()) { |
|---|
| | | MdcEquipmentRunningSectionDto dto; |
|---|
| | | Equipment equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, equipmentRunningSectionVo.getEquipmentId())); |
|---|
| | | String tableName = ""; |
|---|
| | | Boolean isTableExist = false; |
|---|
| | | if (equip != null) { |
|---|
| | | if (StringUtils.isNotBlank(equip.getDrivetype())) { |
|---|
| | | tableName = equip.getDrivetype() + "_" + equip.getEquipmentid(); |
|---|
| | | isTableExist = equipmentWorkLineService.isTableExist(tableName); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | for (MdcEquipmentRunningSection entity : running) { |
|---|
| | | dto = new MdcEquipmentRunningSectionDto(); |
|---|
| | | BeanUtils.copyProperties(entity, dto); |
|---|
| | | if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber())) { |
|---|
| | | Equipment equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, entity.getEquipmentId())); |
|---|
| | | if (equip != null) { |
|---|
| | | if (StringUtils.isNotBlank(equip.getDrivetype())) { |
|---|
| | | List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype(), equip.getEquipmentid(), entity.getStartTime(), entity.getEndTime()); |
|---|
| | | if (esList != null && esList.size() > 1) { |
|---|
| | | dto.setSequenceNumber(esList.get(0).getSequencenumber()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist) { |
|---|
| | | List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime()); |
|---|
| | | if (esList != null && esList.size() > 1) { |
|---|
| | | dto.setSequenceNumber(esList.get(0).getSequencenumber()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | dtos.add(dto); |
|---|
