问题反馈

Lius

2024-05-16 5bbbefadb317d2d9c0c66d86c7ee7f8c3dcb19a3

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

@@ -35,8 +35,12 @@
    @Override
    @Transactional(readOnly = true)
    public List<EquipmentMachingDto> getEquipmentSequencenumber(String tableName, Date startTime, Date endTime) {
        List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
        return convertData(list);
        try {
            List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
            return convertData(list);
        } catch (Exception e) {
            return null;
        }
    }

    @Override
@@ -46,7 +50,7 @@
    }

    @Override
    public List<Map<String, Object>> findRunningData(String tableName, Date startTime, Date endTime) {
    public List<String> findRunningData(String tableName, Date startTime, Date endTime) {
        return equipmentWorkLineMapper.findRunningData(tableName, startTime, endTime);
    }

@@ -56,10 +60,18 @@
    }

    @Override
    public MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount) {
    public MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount, Date startTime, Date endTime) {
        try {
            List<MdcEquipmentDto> macingDataList = equipmentWorkLineMapper.findProductCountStartTime(saveTableName, productCount);
            return !macingDataList.isEmpty() ? macingDataList.get(0) : null;
            return equipmentWorkLineMapper.findProductCountStartTime(saveTableName, productCount, startTime, endTime);
        } catch (Exception e) {
            return null;
        }
    }

    @Override
    public MdcEquipmentDto findProductCountEndTime(String saveTableName, String productCount, Date startTime, Date endTime) {
        try {
            return equipmentWorkLineMapper.findProductCountEndTime(saveTableName, productCount, startTime, endTime);
        } catch (Exception e) {
            return null;
        }