Merge branch 'develop1.0' of https://github.com/Andy-Yin/zhitan-ems into de...

ali

2025-03-26 21b8b0078354b6434351d80222c5944f80606491

Merge branch 'develop1.0' of https://github.com/Andy-Yin/zhitan-ems into develop1.0

 zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java

@@ -39,7 +39,7 @@
    public BranchAnalysisVO getBranchAnalysisService(BranchAnalysisDTO dto) {
        String timeType = dto.getTimeType();
        String dataTime = dto.getDataTime();
        Date beginTime = DateTimeUtil.getTypeTime(timeType, dataTime);
        Date beginTime = DateTimeUtil.getTime(timeType, dataTime);
        DateTime endTime = null;

        List<ModelNodeIndexInfo> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
@@ -68,7 +68,7 @@
            default:
                throw new ServiceException("时间格式错误");
        }
        //获取数据项列表

        List<DataItem> dataItemlist = dataItemMapper.getDataItemTimeRangeInforByIndexIds(beginTime, endTime, timeType, indexlist);

        BranchAnalysisVO vo = new BranchAnalysisVO();