update

lius

2023-08-14 ce61b02c2889a1ebdc71ff048a7836bbf1fe3208

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java

@@ -59,15 +59,10 @@
                    Equipment equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, entity.getEquipmentId()));
                    if (equip != null) {
                        if (StringUtils.isNotBlank(equip.getDrivetype())) {
                            try {
                                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());
                                }
                            } catch (Exception e) {
                                continue;
                            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());
                            }

                        }
                    }
                }
@@ -579,6 +574,16 @@
        return running;
    }

    @Override
    public List<MdcEquipmentRunningSection> listEquipmentRunningSectionRun(String equipmentid, long start, long end) {
        return this.baseMapper.listEquipmentRunningSectionRun(equipmentid, start, end);
    }

    @Override
    public List<MdcEquipmentRunningSection> listEquipmentRunningSectionError(String equipmentid, long start, long end) {
        return this.baseMapper.listEquipmentRunningSectionError(equipmentid, start, end);
    }

    private Map<String, List<MdcEquipmentRunningSectionDto>> logCharts(MdcEquipmentRunningSectionVo equipmentRunningSectionVo, String date) {
        Map<String, List<MdcEquipmentRunningSectionDto>> map = new HashMap<>();
        List<MdcEquipmentRunningSectionDto> normal = new ArrayList<>();