Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

3 天以前 a0400e48a2e8f50c457e1c4d4ba19bab2a0d1301

Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

 src/main/java/com/ruoyi/home/controller/HomeController.java

@@ -325,9 +325,6 @@
    }





    /*******************************************宁夏中盛建材的大屏统计***************************************************/

    @GetMapping("/total")
@@ -354,4 +351,51 @@
        return AjaxResult.success(homeService.customerTrends(salesDeliveryDto));
    }


    @GetMapping("/productionStatistics/materialProductionAnalysis")
    @ApiOperation("生产统计看板-物料生产量分析")
    public AjaxResult materialProductionAnalysis(productionStatisticsDto dto) {
        Map<String, List<MaterialProductionAnalysisDto>> map = homeService.materialProductionAnalysis(dto);
        return AjaxResult.success(map);
    }

    @GetMapping("/productionStatistics/materials")
    @ApiOperation("生产统计看板-获取生产成本单耗统计产品列表")
    public AjaxResult getMaterials(Integer materialType) {
        List<String> list = homeService.getMaterials(materialType);
        return AjaxResult.success(list);
    }

    @GetMapping("/productionStatistics/blocks")
    @ApiOperation("生产统计看板-生产成本单耗统计(砌块)")
    public AjaxResult blocks(productionStatisticsDto dto) {
        return AjaxResult.success(homeService.productionCostAnalysis(dto, 1));
    }

    @GetMapping("/productionStatistics/plates")
    @ApiOperation("生产统计看板-生产成本单耗统计(板材)")
    public AjaxResult plates(productionStatisticsDto dto) {
        return AjaxResult.success(homeService.productionCostAnalysis(dto, 2));
    }

    @GetMapping("/productionStatistics/middle")
    @ApiOperation("生产统计看板-项目产量与固废处理量")
    public AjaxResult middle() {
        ProductionStatisticsMiddleDto middle = homeService.middle();
        return AjaxResult.success(middle);
    }

    @GetMapping("/productionStatistics/solidWaste")
    @ApiOperation("生产统计看板-固废处理量")
    public AjaxResult solidWaste(productionStatisticsDto dto) {
        return AjaxResult.success(homeService.solidWaste(dto));
    }

    @GetMapping("/productionStatistics/energy")
    @ApiOperation("生产统计看板-能耗统计")
    public AjaxResult energy(productionStatisticsDto dto) {
        return AjaxResult.success(homeService.energy(dto));
    }


}

 src/main/java/com/ruoyi/home/dto/HomeEnergyStatisticsDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.ruoyi.home.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * èƒ½è€—统计Dto
 *
 * @author antigravity
 * @version 1.0
 * @since 2026/04/01
 */
@Data
@ApiModel(value = "HomeEnergyStatisticsDto", description = "能耗统计Dto")
public class HomeEnergyStatisticsDto {

    @ApiModelProperty("日期")
    private String dateStr;

    @ApiModelProperty("æ°´")
    private BigDecimal water = BigDecimal.ZERO;

    @ApiModelProperty("电")
    private BigDecimal electricity = BigDecimal.ZERO;

    @ApiModelProperty("蒸汽")
    private BigDecimal steam = BigDecimal.ZERO;

}

 src/main/java/com/ruoyi/home/dto/InputOutputAnalysisDto.java

@@ -7,10 +7,19 @@
@Data
public class InputOutputAnalysisDto {

    /**
     * æ—¥æœŸ
     */
    private String date;

    /**
     * æŠ•å…¥æ•°é‡
     */
    private BigDecimal inputSum;

    /**
     * äº§å‡ºæ•°é‡
     */
    private BigDecimal outputSum;

}

 src/main/java/com/ruoyi/home/dto/MaterialProductionAnalysisDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.ruoyi.home.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * ç‰©æ–™ç”Ÿäº§é‡åˆ†æžDto
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/04/01
 */
@Data
@ApiModel(value = "MaterialProductionAnalysisDto", description = "物料生产量分析Dto")
public class MaterialProductionAnalysisDto {

    @ApiModelProperty("日期")
    private String dateStr;

    @ApiModelProperty("全部产量")
    private BigDecimal totalOutput;

    @ApiModelProperty("砌块产量")
    private BigDecimal blockOutput;

    @ApiModelProperty("板材产量")
    private BigDecimal plateOutput;

}

 src/main/java/com/ruoyi/home/dto/ProductionCostAnalysisDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
package com.ruoyi.home.dto;

import lombok.Data;

import java.util.List;

@Data
public class ProductionCostAnalysisDto {

    /**
     * ç‰©æ–™åç§°
     */
    private String materialName;

    /**
     * æœˆæŠ•å…¥é‡
     */
    private String monthlyConsumption;

    /**
     * å¹´äº§å‡ºé‡
     */
    private String yearlyConsumption;

    /**
     * äº§å‡ºæ•°æ®
     */
    private List<InputOutputAnalysisDto> chartData;

}

 src/main/java/com/ruoyi/home/dto/ProductionStatisticsMiddleDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.ruoyi.home.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("生产统计看板-项目产量与固废处理量数据模型")
public class ProductionStatisticsMiddleDto {

    @ApiModelProperty("粉煤灰-月处理量")
    private BigDecimal flyAshMonth = BigDecimal.ZERO;

    @ApiModelProperty("粉煤灰-年处理量")
    private BigDecimal flyAshYear = BigDecimal.ZERO;

    @ApiModelProperty("石膏-月处理量")
    private BigDecimal gypsumMonth = BigDecimal.ZERO;

    @ApiModelProperty("石膏-年处理量")
    private BigDecimal gypsumYear = BigDecimal.ZERO;

    @ApiModelProperty("砌块-月产量")
    private BigDecimal blockMonth = BigDecimal.ZERO;

    @ApiModelProperty("砌块-年产量")
    private BigDecimal blockYear = BigDecimal.ZERO;

    @ApiModelProperty("板材-月产量")
    private BigDecimal plateMonth = BigDecimal.ZERO;

    @ApiModelProperty("板材-年产量")
    private BigDecimal plateYear = BigDecimal.ZERO;
}

 src/main/java/com/ruoyi/home/dto/SolidWasteStatisticsDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.ruoyi.home.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * å›ºåºŸå¤„理量统计Dto
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/04/01
 */
@Data
@ApiModel(value = "SolidWasteStatisticsDto", description = "固废处理量统计Dto")
public class SolidWasteStatisticsDto {

    @ApiModelProperty("日期")
    private String dateStr;

    @ApiModelProperty("全部")
    private BigDecimal total = BigDecimal.ZERO;

    @ApiModelProperty("粉煤灰")
    private BigDecimal flyAsh = BigDecimal.ZERO;

    @ApiModelProperty("石膏")
    private BigDecimal gypsum = BigDecimal.ZERO;

    @ApiModelProperty("石灰")
    private BigDecimal lime = BigDecimal.ZERO;

}

 src/main/java/com/ruoyi/home/dto/productionStatisticsDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.ruoyi.home.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * <br>
 * ç”Ÿäº§ç»Ÿè®¡çœ‹æ¿Dto
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/04/01
 */
@Data
@ApiModel(value = "productionStatisticsDto", description = "生产统计看板Dto")
public class productionStatisticsDto {

    @ApiModelProperty("物料名称")
    private String materialName;

    @ApiModelProperty("1 æœˆ/2 å¹´")
    private Integer dateType;
}

 src/main/java/com/ruoyi/home/mapper/HomeMapper.java

@@ -2,7 +2,11 @@

import com.ruoyi.dto.MapDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

/**
 * é¦–页统计 Mapper

 src/main/java/com/ruoyi/home/service/HomeService.java

@@ -107,4 +107,16 @@
    List<SalesTotalDetailDto> salesDataRanking(SalesDeliveryDto salesDeliveryDto);

    SalesTotalDto customerTrends(SalesDeliveryDto salesDeliveryDto);

    Map<String,List<MaterialProductionAnalysisDto>> materialProductionAnalysis(productionStatisticsDto dto);

    List<String> getMaterials(Integer materialType);

    List<ProductionCostAnalysisDto> productionCostAnalysis(productionStatisticsDto dto, Integer materialType);

    ProductionStatisticsMiddleDto middle();

    List<SolidWasteStatisticsDto> solidWaste(productionStatisticsDto dto);

    List<HomeEnergyStatisticsDto> energy(productionStatisticsDto dto);
}

 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -5,15 +5,13 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.home.mapper.HomeMapper;
import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.Product;
@@ -28,25 +26,20 @@
import com.ruoyi.dto.MapDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.mapper.HomeMapper;
import com.ruoyi.home.service.HomeService;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.mapper.ProductOrderMapper;
import com.ruoyi.production.mapper.ProductProcessMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.mapper.ProductionProductInputMapper;
import com.ruoyi.production.mapper.ProductionProductOutputMapper;
import com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper;
import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.*;
import com.ruoyi.productionPlan.enums.AddressRegionEnum;
import com.ruoyi.productionPlan.mapper.SalesDeliveryMapper;
import com.ruoyi.productionPlan.pojo.SalesDelivery;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysDictDataMapper;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PaymentRegistration;
@@ -61,9 +54,13 @@
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.production.utils.UnitUtils;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.energy.mapper.EnergyConsumptionDetailMapper;
import com.ruoyi.energy.dto.EnergyCostDto;
import com.ruoyi.energy.vo.EnergyStatisticsVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -143,6 +140,9 @@

    @Autowired
    private QualityInspectMapper qualityInspectMapper;

    @Autowired
    private EnergyConsumptionDetailMapper energyConsumptionDetailMapper;

    @Autowired
    private QualityUnqualifiedMapper qualityUnqualifiedMapper;
@@ -2537,10 +2537,10 @@
                .map(item -> item.getVolume() != null ? new BigDecimal(item.getVolume().toString()) : BigDecimal.ZERO)
                .reduce(BigDecimal.ZERO, BigDecimal::add);
        long finalVolume = volume.divide(new BigDecimal("1000"), 0, RoundingMode.HALF_UP).longValue();
        map.put("volume",finalVolume);
        map.put("volume", finalVolume);
        //累计客户
        Long count = customerMapper.selectCount(null);
        map.put("customer",count);
        map.put("customer", count);
        return map;
    }

@@ -2550,11 +2550,11 @@
        List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
        List<Map<String, Long>> maps = new ArrayList<>();
        List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(Wrappers.<SalesDelivery>lambdaQuery()
                .eq(SalesDelivery::getProductName,salesDeliveryDto.getType()));
                .eq(SalesDelivery::getProductName, salesDeliveryDto.getType()));
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
            if (salesDeliveryDto.getDays().equals("å¹´")) {
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            LocalDate finalLastDay = lastDay;
@@ -2597,11 +2597,11 @@
        List<SalesTotalDetailDto> salesTotalDetailDtos = new ArrayList<>();
        List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
        List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(Wrappers.<SalesDelivery>lambdaQuery()
                .eq(SalesDelivery::getProductName,salesDeliveryDto.getType()));
                .eq(SalesDelivery::getProductName, salesDeliveryDto.getType()));
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
            if (salesDeliveryDto.getDays().equals("å¹´")) {
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            LocalDate finalLastDay = lastDay;
@@ -2646,11 +2646,11 @@
        List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
        List<Map<String, Long>> maps = new ArrayList<>();
        List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(Wrappers.<SalesDelivery>lambdaQuery()
                .eq(SalesDelivery::getProductName,salesDeliveryDto.getType()));
                .eq(SalesDelivery::getProductName, salesDeliveryDto.getType()));
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
            if (salesDeliveryDto.getDays().equals("å¹´")) {
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            LocalDate finalLastDay = lastDay;
@@ -2704,7 +2704,7 @@
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
            if (salesDeliveryDto.getDays().equals("å¹´")) {
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            Date startDate = Date.from(firstDay.atStartOfDay(ZoneId.systemDefault()).toInstant());
@@ -2728,7 +2728,7 @@
                                Collectors.counting()   // è®¡æ•°
                        ));
            }
            regionCountMap.put("全部",customers.stream().count());
            regionCountMap.put("全部", customers.stream().count());
            maps.add(regionCountMap);
        }
        salesTotalDto.setDates(dates);
@@ -2738,6 +2738,7 @@

    /**
     * æ ¹æ®å‰ç«¯ä¼ å‚ å¹´/月 è½¬æ¢ä¸ºå¯¹åº”LocalDate列表
     *
     * @param days å‰ç«¯å‚数："å¹´" / "月"
     * @return List<LocalDate>
     */
@@ -2759,4 +2760,677 @@
        }
        return resultList;
    }

    @Autowired
    private ProductionProductMainService productionProductMainService;

    @Autowired
    private ProductOrderService productOrderService;

    @Autowired
    private ProductionProductInputService productionProductInputService;

    @Autowired
    private ProductionProductOutputService productionProductOutputService;

    @Autowired
    private IProductionOrderRouteService productionOrderRouteService;

    @Autowired
    private SysDictDataMapper sysDictDataMapper;

    @Override
    public Map<String, List<MaterialProductionAnalysisDto>> materialProductionAnalysis(productionStatisticsDto dto) {
        if (dto == null) {
            dto = new productionStatisticsDto();
            dto.setMaterialName("全部");
            dto.setDateType(1);
        }

        LocalDate now = LocalDate.now();
        LocalDate startDate = null;

        if (dto.getDateType() == 1) { // æœ¬æœˆè‡³ä»Š
            startDate = now.withDayOfMonth(1);
        } else { // æœ¬å¹´è‡³ä»Š
            startDate = now.withDayOfYear(1);
        }

        List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByType("product_type");
        Set<Long> blockDictCodes = sysDictDataList.stream()
                .filter(d -> d.getDictLabel() != null && d.getDictLabel().contains("砌块"))
                .map(SysDictData::getDictCode)
                .collect(Collectors.toSet());
        Set<Long> plateDictCodes = sysDictDataList.stream()
                .filter(d -> d.getDictLabel() != null && d.getDictLabel().contains("板材"))
                .map(SysDictData::getDictCode)
                .collect(Collectors.toSet());

        //  æŸ¥è¯¢æŠ¥å·¥ä¸»è¡¨æ•°æ®
        List<ProductionProductMain> productionProductMainList = productionProductMainService.list(Wrappers.<ProductionProductMain>lambdaQuery()
                .between(ProductionProductMain::getReportingTime,
                        startDate.atStartOfDay(),
                        now.atTime(LocalTime.MAX)));

        if (CollectionUtils.isEmpty(productionProductMainList)) {
            return Collections.emptyMap();
        }

        List<Long> productionMainIds = productionProductMainList.stream()
                .map(ProductionProductMain::getId)
                .collect(Collectors.toList());

        //  èŽ·å–产出明细
        List<ProductionProductOutput> productionProductOutputs = productionProductOutputService.list(new LambdaQueryWrapper<ProductionProductOutput>()
                .in(ProductionProductOutput::getProductMainId, productionMainIds));

        Map<Long, ProductionProductMain> mainMap = productionProductMainList.stream()
                .collect(Collectors.toMap(ProductionProductMain::getId, m -> m));

        //  èŽ·å–订单工艺
        List<Long> productionOrderIds = productionProductMainList.stream()
                .map(ProductionProductMain::getProductOrderId)
                .distinct()
                .collect(Collectors.toList());

        Map<Long, Long> orderRouteMap = new HashMap<>();
        if (!CollectionUtils.isEmpty(productionOrderIds)) {
            List<ProductionOrderRoute> routes = productionOrderRouteService.list(Wrappers.<ProductionOrderRoute>lambdaQuery()
                    .in(ProductionOrderRoute::getOrderId, productionOrderIds));
            orderRouteMap = routes.stream()
                    .filter(r -> r.getOrderId() != null && r.getDictCode() != null)
                    .collect(Collectors.toMap(ProductionOrderRoute::getOrderId, ProductionOrderRoute::getDictCode, (v1, v2) -> v1));
        }

        List<String> dateLabels = new ArrayList<>();
        DateTimeFormatter formatter;
        if (dto.getDateType() == 1) { // æœ¬æœˆæŒ‰å¤©
            formatter = DateTimeFormatter.ofPattern("MM-dd");
            long days = ChronoUnit.DAYS.between(startDate, now) + 1;
            for (int i = 0; i < days; i++) {
                dateLabels.add(startDate.plusDays(i).format(formatter));
            }
        } else { // æœ¬å¹´æŒ‰æœˆ
            formatter = DateTimeFormatter.ofPattern("yy-M");
            int currentMonth = now.getMonthValue();
            for (int i = 1; i <= currentMonth; i++) {
                dateLabels.add(startDate.withMonth(i).format(formatter));
            }
        }

        Map<String, Map<String, BigDecimal>> aggregateData = new HashMap<>();
        String[] categories = {"全部", "砌块", "板材"};
        for (String cat : categories) {
            Map<String, BigDecimal> dayMap = new LinkedHashMap<>();
            for (String label : dateLabels) {
                dayMap.put(label, BigDecimal.ZERO);
            }
            aggregateData.put(cat, dayMap);
        }

        //  ç´¯åŠ æ•°æ®
        for (ProductionProductOutput output : productionProductOutputs) {
            ProductionProductMain main = mainMap.get(output.getProductMainId());
            if (main == null || main.getReportingTime() == null) continue;
            String label = main.getReportingTime().format(formatter);
            if (!aggregateData.get("全部").containsKey(label)) continue;
            BigDecimal qty = output.getQuantity() != null ? output.getQuantity() : BigDecimal.ZERO;
            // ç´¯åŠ æ€»äº§å‡º
            aggregateData.get("全部").merge(label, qty, BigDecimal::add);
            // åˆ†ç±»ç´¯åŠ 
            Long dictCode = orderRouteMap.get(main.getProductOrderId());
            if (dictCode != null) {
                if (blockDictCodes.contains(dictCode)) {
                    aggregateData.get("砌块").merge(label, qty, BigDecimal::add);
                } else if (plateDictCodes.contains(dictCode)) {
                    aggregateData.get("板材").merge(label, qty, BigDecimal::add);
                }
            }
        }

        Map<String, List<MaterialProductionAnalysisDto>> result = new LinkedHashMap<>();
        for (String category : categories) {
            List<MaterialProductionAnalysisDto> dtoList = new ArrayList<>();
            for (String label : dateLabels) {
                MaterialProductionAnalysisDto item = new MaterialProductionAnalysisDto();
                item.setDateStr(label);
                item.setTotalOutput(BigDecimal.ZERO);
                item.setBlockOutput(BigDecimal.ZERO);
                item.setPlateOutput(BigDecimal.ZERO);
                BigDecimal val = aggregateData.get(category).get(label);
                switch (category) {
                    case "全部":
                        item.setTotalOutput(val);
                        break;
                    case "砌块":
                        item.setBlockOutput(val);
                        break;
                    case "板材":
                        item.setPlateOutput(val);
                        break;
                }
                dtoList.add(item);
            }
            result.put(category, dtoList);
        }

        return result;
    }

    @Autowired
    private IProductionOrderStructureService productionOrderStructureService;

    @Autowired
    private ProductMaterialService productMaterialService;

    @Autowired
    private ProductMaterialSkuService productMaterialSkuService;

    @Override
    public List<String> getMaterials(Integer materialType) {
        // èŽ·å–产品类型字典
        List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByType("product_type");
        Set<Long> targetDictCodes;
        if (materialType != null && materialType == 1) { // ç Œå—
            targetDictCodes = sysDictDataList.stream()
                    .filter(d -> d.getDictLabel() != null && d.getDictLabel().contains("砌块"))
                    .map(SysDictData::getDictCode)
                    .collect(Collectors.toSet());
        } else if (materialType != null && materialType == 2) { // æ¿æ
            targetDictCodes = sysDictDataList.stream()
                    .filter(d -> d.getDictLabel() != null && d.getDictLabel().contains("板材"))
                    .map(SysDictData::getDictCode)
                    .collect(Collectors.toSet());
        } else {
            return Collections.emptyList();
        }

        if (CollectionUtils.isEmpty(targetDictCodes)) {
            return Collections.emptyList();
        }

        //  æ ¹æ®äº§å“ç±»åž‹å­—典编码找到对应的生产订单ID
        List<ProductionOrderRoute> routes = productionOrderRouteService.list(Wrappers.<ProductionOrderRoute>lambdaQuery()
                .in(ProductionOrderRoute::getDictCode, targetDictCodes));
        List<Long> orderIds = routes.stream().map(ProductionOrderRoute::getOrderId).distinct().collect(Collectors.toList());

        if (CollectionUtils.isEmpty(orderIds)) {
            return Collections.emptyList();
        }

        //  æ ¹æ®ç”Ÿäº§è®¢å•ID查询BOM结构中的物料SKU ID
        List<ProductionOrderStructure> structures = productionOrderStructureService.list(Wrappers.<ProductionOrderStructure>lambdaQuery()
                .in(ProductionOrderStructure::getOrderId, orderIds));
        List<Long> skuIds = structures.stream()
                .map(ProductionOrderStructure::getProductModelId)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());

        if (CollectionUtils.isEmpty(skuIds)) {
            return Collections.emptyList();
        }

        //  æ ¹æ®SKU ID获取物料表ID
        List<ProductMaterialSku> skus = productMaterialSkuService.list(Wrappers.<ProductMaterialSku>lambdaQuery()
                .in(ProductMaterialSku::getId, skuIds));
        List<Long> productIds = skus.stream()
                .map(ProductMaterialSku::getProductId)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());

        if (CollectionUtils.isEmpty(productIds)) {
            return Collections.emptyList();
        }

        //  æ ¹æ®ç‰©æ–™ä¸»è¡¨ID获取物料名称
        List<ProductMaterial> materials = productMaterialService.list(Wrappers.<ProductMaterial>lambdaQuery()
                .in(ProductMaterial::getId, productIds));

        return materials.stream()
                .map(ProductMaterial::getProductName)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());
    }

    @Override
    public List<ProductionCostAnalysisDto> productionCostAnalysis(productionStatisticsDto dto, Integer materialType) {
        //  èŽ·å–动态字典ID
        List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByType("product_type");
        Set<Long> targetDictCodes = sysDictDataList.stream()
                .filter(d -> d.getDictLabel() != null && d.getDictLabel().contains(materialType == 1 ? "砌块" : "板材"))
                .map(SysDictData::getDictCode)
                .collect(Collectors.toSet());

        if (CollectionUtils.isEmpty(targetDictCodes)) return Collections.emptyList();

        //  èŽ·å–该类型的订单
        List<ProductionOrderRoute> routes = productionOrderRouteService.list(Wrappers.<ProductionOrderRoute>lambdaQuery()
                .in(ProductionOrderRoute::getDictCode, targetDictCodes));
        List<Long> orderIds = routes.stream().map(ProductionOrderRoute::getOrderId).distinct().collect(Collectors.toList());
        if (CollectionUtils.isEmpty(orderIds)) return Collections.emptyList();

        //  æ—¶é—´èŒƒå›´å¤„理
        LocalDate now = LocalDate.now();
        LocalDateTime yearStart = now.withDayOfYear(1).atStartOfDay();
        LocalDateTime monthStart = now.withDayOfMonth(1).atStartOfDay();

        LocalDateTime trendStart;
        DateTimeFormatter trendFormatter;
        int points;
        if (dto.getDateType() != null && dto.getDateType() == 1) {
            trendStart = monthStart;
            trendFormatter = DateTimeFormatter.ofPattern("MM-dd");
            points = now.getDayOfMonth();
        } else {
            trendStart = yearStart;
            trendFormatter = DateTimeFormatter.ofPattern("yy-MM");
            points = now.getMonthValue();
        }

        //  æŸ¥è¯¢æŠ¥å·¥æ•°æ®
        List<ProductionProductMain> mainList = productionProductMainService.list(Wrappers.<ProductionProductMain>lambdaQuery()
                .in(ProductionProductMain::getProductOrderId, orderIds)
                .ge(ProductionProductMain::getReportingTime, yearStart));
        if (CollectionUtils.isEmpty(mainList)) return Collections.emptyList();

        List<Long> mainIds = mainList.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
        Map<Long, ProductionProductMain> mainMap = mainList.stream().collect(Collectors.toMap(ProductionProductMain::getId, m -> m));

        //  æŸ¥è¯¢æŠ•å…¥å’Œäº§å‡º
        List<ProductionProductInput> allInputs = productionProductInputService.list(Wrappers.<ProductionProductInput>lambdaQuery()
                .in(ProductionProductInput::getProductMainId, mainIds));
        List<ProductionProductOutput> allOutputs = productionProductOutputService.list(Wrappers.<ProductionProductOutput>lambdaQuery()
                .in(ProductionProductOutput::getProductMainId, mainIds));

        // èŽ·å–投入物料的基础信息
        Set<Long> inputSkuIds = allInputs.stream().map(ProductionProductInput::getProductId).filter(Objects::nonNull).collect(Collectors.toSet());
        Set<Long> outputSkuIds = allOutputs.stream().map(ProductionProductOutput::getProductModelId).filter(Objects::nonNull).collect(Collectors.toSet());

        Map<Long, ProductMaterial> inputSkuToMatMap = new HashMap<>();
        if (!inputSkuIds.isEmpty()) {
            List<ProductMaterialSku> inputSkus = productMaterialSkuService.listByIds(inputSkuIds);
            Set<Long> inputActualProdIds = inputSkus.stream().map(ProductMaterialSku::getProductId).filter(Objects::nonNull).collect(Collectors.toSet());
            Map<Long, ProductMaterial> materialMap = productMaterialService.listByIds(inputActualProdIds).stream()
                    .collect(Collectors.toMap(ProductMaterial::getId, m -> m));
            inputSkuToMatMap = inputSkus.stream().collect(Collectors.toMap(ProductMaterialSku::getId, s -> materialMap.get(s.getProductId())));
        }

        Map<Long, String> outputSkuToUnitMap = new HashMap<>();
        if (!outputSkuIds.isEmpty()) {
            List<ProductMaterialSku> outSkus = productMaterialSkuService.listByIds(outputSkuIds);
            Set<Long> outProdIds = outSkus.stream().map(ProductMaterialSku::getProductId).filter(Objects::nonNull).collect(Collectors.toSet());
            Map<Long, String> matUnitMap = productMaterialService.listByIds(outProdIds).stream().collect(Collectors.toMap(ProductMaterial::getId, ProductMaterial::getUnit));
            outputSkuToUnitMap = outSkus.stream().collect(Collectors.toMap(ProductMaterialSku::getId, s -> matUnitMap.getOrDefault(s.getProductId(), "吨")));
        }

        //  æŒ‰ç‰©æ–™åˆ†ç»„聚合
        Map<Long, ProductMaterial> finalSkuToMatMap = inputSkuToMatMap;
        Map<String, List<ProductionProductInput>> inputByMaterial = allInputs.stream()
                .filter(i -> finalSkuToMatMap.containsKey(i.getProductId()) && finalSkuToMatMap.get(i.getProductId()) != null)
                .collect(Collectors.groupingBy(i -> finalSkuToMatMap.get(i.getProductId()).getProductName()));

        if (dto.getMaterialName() != null && !"全部".equals(dto.getMaterialName())) {
            String target = dto.getMaterialName();
            inputByMaterial = inputByMaterial.entrySet().stream()
                    .filter(e -> e.getKey().equals(target))
                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
        }

        List<ProductionCostAnalysisDto> resultList = new ArrayList<>();

        for (Map.Entry<String, List<ProductionProductInput>> entry : inputByMaterial.entrySet()) {
            String materialName = entry.getKey();
            List<ProductionProductInput> materialInputs = entry.getValue();

            ProductionCostAnalysisDto analysisDto = new ProductionCostAnalysisDto();
            analysisDto.setMaterialName(materialName);

            Set<Long> relatedMainIds = materialInputs.stream().map(ProductionProductInput::getProductMainId).collect(Collectors.toSet());
            List<ProductionProductOutput> relatedOutputs = allOutputs.stream()
                    .filter(o -> relatedMainIds.contains(o.getProductMainId()))
                    .collect(Collectors.toList());

            BigDecimal monthInputSum = BigDecimal.ZERO;
            BigDecimal monthOutputSum = BigDecimal.ZERO;
            BigDecimal yearInputSum = BigDecimal.ZERO;
            BigDecimal yearOutputSum = BigDecimal.ZERO;

            Map<String, InputOutputAnalysisDto> trendMap = new LinkedHashMap<>();
            for (int i = 0; i < points; i++) {
                String label;
                if (dto.getDateType() != null && dto.getDateType() == 1) {
                    label = now.withDayOfMonth(i + 1).format(trendFormatter);
                } else {
                    label = now.withMonth(i + 1).format(trendFormatter);
                }
                InputOutputAnalysisDto trendDto = new InputOutputAnalysisDto();
                trendDto.setDate(label);
                trendDto.setInputSum(BigDecimal.ZERO);
                trendDto.setOutputSum(BigDecimal.ZERO);
                trendMap.put(label, trendDto);
            }

            for (ProductionProductInput input : materialInputs) {
                BigDecimal qty = UnitUtils.convertValueToTon(input.getQuantity(), input.getUnit());
                yearInputSum = yearInputSum.add(qty);
                LocalDateTime repTime = mainMap.get(input.getProductMainId()).getReportingTime();
                if (repTime != null && (repTime.isAfter(monthStart) || repTime.isEqual(monthStart))) {
                    monthInputSum = monthInputSum.add(qty);
                }
                if (repTime != null && (repTime.isAfter(trendStart) || repTime.isEqual(trendStart))) {
                    String label = repTime.format(trendFormatter);
                    if (trendMap.containsKey(label)) {
                        trendMap.get(label).setInputSum(trendMap.get(label).getInputSum().add(qty));
                    }
                }
            }

            for (ProductionProductOutput output : relatedOutputs) {
                String unit = outputSkuToUnitMap.getOrDefault(output.getProductModelId(), "吨");
                BigDecimal qty = UnitUtils.convertValueToTon(output.getQuantity(), unit);
                yearOutputSum = yearOutputSum.add(qty);
                LocalDateTime repTime = mainMap.get(output.getProductMainId()).getReportingTime();
                if (repTime != null && (repTime.isAfter(monthStart) || repTime.isEqual(monthStart))) {
                    monthOutputSum = monthOutputSum.add(qty);
                }
                if (repTime != null && (repTime.isAfter(trendStart) || repTime.isEqual(trendStart))) {
                    String label = repTime.format(trendFormatter);
                    if (trendMap.containsKey(label)) {
                        trendMap.get(label).setOutputSum(trendMap.get(label).getOutputSum().add(qty));
                    }
                }
            }

            analysisDto.setMonthlyConsumption(formatRatio(monthInputSum, monthOutputSum));
            analysisDto.setYearlyConsumption(formatRatio(yearInputSum, yearOutputSum));
            analysisDto.setChartData(new ArrayList<>(trendMap.values()));
            resultList.add(analysisDto);
        }

        return resultList;
    }

    private String formatRatio(BigDecimal input, BigDecimal output) {
        String inputStr = input.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
        String outputStr = output.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
        return inputStr + "/" + outputStr;
    }

    @Override
    public ProductionStatisticsMiddleDto middle() {
        LocalDate now = LocalDate.now();
        LocalDate monthStart = now.withDayOfMonth(1);
        LocalDate yearStart = now.withDayOfYear(1);

        // èŽ·å–产品类型字典
        List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByType("product_type");
        Set<Long> blockDictCodes = sysDictDataList.stream()
                .filter(d -> d.getDictLabel() != null && d.getDictLabel().contains("砌块"))
                .map(SysDictData::getDictCode)
                .collect(Collectors.toSet());
        Set<Long> plateDictCodes = sysDictDataList.stream()
                .filter(d -> d.getDictLabel() != null && d.getDictLabel().contains("板材"))
                .map(SysDictData::getDictCode)
                .collect(Collectors.toSet());

        // æŸ¥è¯¢æœ¬å¹´æŠ¥å·¥ä¸»è¡¨
        List<ProductionProductMain> yearMainList = productionProductMainService.list(Wrappers.<ProductionProductMain>lambdaQuery()
                .ge(ProductionProductMain::getReportingTime, yearStart.atStartOfDay()));
        if (CollectionUtils.isEmpty(yearMainList)) return new ProductionStatisticsMiddleDto();

        List<Long> mainIds = yearMainList.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
        Map<Long, ProductionProductMain> mainMap = yearMainList.stream().collect(Collectors.toMap(ProductionProductMain::getId, m -> m));

        // èŽ·å–订单信息
        List<Long> orderIds = yearMainList.stream().map(ProductionProductMain::getProductOrderId).distinct().collect(Collectors.toList());
        Map<Long, Long> orderRouteMap = new HashMap<>();
        if (!CollectionUtils.isEmpty(orderIds)) {
            List<ProductionOrderRoute> routes = productionOrderRouteService.list(Wrappers.<ProductionOrderRoute>lambdaQuery()
                    .in(ProductionOrderRoute::getOrderId, orderIds));
            orderRouteMap = routes.stream()
                    .filter(r -> r.getOrderId() != null && r.getDictCode() != null)
                    .collect(Collectors.toMap(ProductionOrderRoute::getOrderId, ProductionOrderRoute::getDictCode, (v1, v2) -> v1));
        }

        // èŽ·å–产出明细（用于砌块、板材产量）
        List<ProductionProductOutput> allOutputs = productionProductOutputService.list(Wrappers.<ProductionProductOutput>lambdaQuery()
                .in(ProductionProductOutput::getProductMainId, mainIds));

        // èŽ·å–投入明细（用于粉煤灰、石膏处理量）
        List<ProductionProductInput> allInputs = productionProductInputService.list(Wrappers.<ProductionProductInput>lambdaQuery()
                .in(ProductionProductInput::getProductMainId, mainIds));

        // ç»Ÿä¸€å¤„理规格/物料名称映射
        Set<Long> allSkuIds = new HashSet<>();
        allOutputs.forEach(o -> allSkuIds.add(o.getProductModelId()));
        allInputs.forEach(i -> allSkuIds.add(i.getProductId()));
        allSkuIds.remove(null);

        Map<Long, String> skuToMaterialNameMap = new HashMap<>();
        if (!allSkuIds.isEmpty()) {
            List<ProductMaterialSku> skus = productMaterialSkuService.listByIds(allSkuIds);
            Set<Long> productIds = skus.stream().map(ProductMaterialSku::getProductId).filter(Objects::nonNull).collect(Collectors.toSet());
            Map<Long, String> materialNameMap = productMaterialService.listByIds(productIds).stream()
                    .collect(Collectors.toMap(ProductMaterial::getId, ProductMaterial::getProductName));
            skuToMaterialNameMap = skus.stream()
                    .filter(s -> s.getProductId() != null && materialNameMap.containsKey(s.getProductId()))
                    .collect(Collectors.toMap(ProductMaterialSku::getId, s -> materialNameMap.get(s.getProductId())));
        }

        ProductionStatisticsMiddleDto result = new ProductionStatisticsMiddleDto();
        LocalDateTime monthStartDt = monthStart.atStartOfDay();

        // ç»Ÿè®¡å›ºåºŸå¤„理量,从投入获取数据
        for (ProductionProductInput input : allInputs) {
            ProductionProductMain main = mainMap.get(input.getProductMainId());
            if (main == null || main.getReportingTime() == null) continue;

            BigDecimal qty = UnitUtils.convertValueToTon(input.getQuantity(), input.getUnit());
            boolean isCurrentMonth = !main.getReportingTime().isBefore(monthStartDt);
            String materialName = skuToMaterialNameMap.get(input.getProductId());

            if ("粉煤灰".equals(materialName)) {
                result.setFlyAshYear(result.getFlyAshYear().add(qty));
                if (isCurrentMonth) result.setFlyAshMonth(result.getFlyAshMonth().add(qty));
            } else if ("石膏".equals(materialName)) {
                result.setGypsumYear(result.getGypsumYear().add(qty));
                if (isCurrentMonth) result.setGypsumMonth(result.getGypsumMonth().add(qty));
            }
        }

        // ç»Ÿè®¡é¡¹ç›®äº§é‡,从产出获取数据
        for (ProductionProductOutput output : allOutputs) {
            ProductionProductMain main = mainMap.get(output.getProductMainId());
            if (main == null || main.getReportingTime() == null) continue;

            BigDecimal qty = UnitUtils.convertValueToTon(output.getQuantity(), "吨"); // äº§å‡ºæ–¹é‡é€šå¸¸ä¸ºå¨
            boolean isCurrentMonth = !main.getReportingTime().isBefore(monthStartDt);

            Long dictCode = orderRouteMap.get(main.getProductOrderId());
            if (dictCode != null) {
                if (blockDictCodes.contains(dictCode)) {
                    result.setBlockYear(result.getBlockYear().add(qty));
                    if (isCurrentMonth) result.setBlockMonth(result.getBlockMonth().add(qty));
                } else if (plateDictCodes.contains(dictCode)) {
                    result.setPlateYear(result.getPlateYear().add(qty));
                    if (isCurrentMonth) result.setPlateMonth(result.getPlateMonth().add(qty));
                }
            }
        }

        return result;
    }

    @Override
    public List<SolidWasteStatisticsDto> solidWaste(productionStatisticsDto dto) {
        if (dto == null) {
            dto = new productionStatisticsDto();
            dto.setDateType(1);
        }

        LocalDate now = LocalDate.now();
        LocalDate startDate = null;

        if (dto.getDateType() != null && dto.getDateType() == 1) { // æœ¬æœˆè‡³ä»Š
            startDate = now.withDayOfMonth(1);
        } else { // æœ¬å¹´è‡³ä»Š
            startDate = now.withDayOfYear(1);
        }

        List<String> dateLabels = new ArrayList<>();
        DateTimeFormatter formatter;
        if (dto.getDateType() != null && dto.getDateType() == 1) { // æœ¬æœˆæŒ‰å¤©
            formatter = DateTimeFormatter.ofPattern("MM-dd");
            long days = ChronoUnit.DAYS.between(startDate, now) + 1;
            for (int i = 0; i < days; i++) {
                dateLabels.add(startDate.plusDays(i).format(formatter));
            }
        } else { // æœ¬å¹´æŒ‰æœˆ
            formatter = DateTimeFormatter.ofPattern("yy-MM");
            int currentMonth = now.getMonthValue();
            for (int i = 1; i <= currentMonth; i++) {
                dateLabels.add(startDate.withMonth(i).format(formatter));
            }
        }

        //  æŸ¥è¯¢æ—¶é—´èŒƒå›´å†…的报工数据
        List<ProductionProductMain> mainList = productionProductMainService.list(Wrappers.<ProductionProductMain>lambdaQuery()
                .ge(ProductionProductMain::getReportingTime, startDate.atStartOfDay()));
        if (CollectionUtils.isEmpty(mainList)) return new ArrayList<>();

        List<Long> mainIds = mainList.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
        Map<Long, ProductionProductMain> mainMap = mainList.stream().collect(Collectors.toMap(ProductionProductMain::getId, m -> m));

        //  èŽ·å–投入明细
        List<ProductionProductInput> allInputs = productionProductInputService.list(Wrappers.<ProductionProductInput>lambdaQuery()
                .in(ProductionProductInput::getProductMainId, mainIds));
        if (CollectionUtils.isEmpty(allInputs)) return new ArrayList<>();

        //  èŽ·å–规格和物料名称
        Set<Long> skuIds = allInputs.stream().map(ProductionProductInput::getProductId).filter(Objects::nonNull).collect(Collectors.toSet());
        Map<Long, String> skuToMaterialNameMap = new HashMap<>();
        if (!skuIds.isEmpty()) {
            List<ProductMaterialSku> skus = productMaterialSkuService.listByIds(skuIds);
            Set<Long> productIds = skus.stream().map(ProductMaterialSku::getProductId).filter(Objects::nonNull).collect(Collectors.toSet());
            Map<Long, String> materialNameMap = productMaterialService.listByIds(productIds).stream()
                    .collect(Collectors.toMap(ProductMaterial::getId, ProductMaterial::getProductName));
            skuToMaterialNameMap = skus.stream()
                    .filter(s -> s.getProductId() != null && materialNameMap.containsKey(s.getProductId()))
                    .collect(Collectors.toMap(ProductMaterialSku::getId, s -> materialNameMap.get(s.getProductId())));
        }

        Map<String, SolidWasteStatisticsDto> resultData = new LinkedHashMap<>();
        for (String label : dateLabels) {
            SolidWasteStatisticsDto item = new SolidWasteStatisticsDto();
            item.setDateStr(label);
            resultData.put(label, item);
        }

        //  æŒ‰æ—¥æœŸå’Œç‰©æ–™
        for (ProductionProductInput input : allInputs) {
            ProductionProductMain main = mainMap.get(input.getProductMainId());
            if (main == null || main.getReportingTime() == null) continue;
            String label = main.getReportingTime().format(formatter);
            if (!resultData.containsKey(label)) continue;

            BigDecimal qty = UnitUtils.convertValueToTon(input.getQuantity(), input.getUnit());
            String materialName = skuToMaterialNameMap.get(input.getProductId());

            SolidWasteStatisticsDto dayDto = resultData.get(label);
            if ("粉煤灰".equals(materialName)) {
                dayDto.setFlyAsh(dayDto.getFlyAsh().add(qty));
            } else if ("石膏".equals(materialName)) {
                dayDto.setGypsum(dayDto.getGypsum().add(qty));
            } else if ("石灰".equals(materialName)) {
                dayDto.setLime(dayDto.getLime().add(qty));
            }
            dayDto.setTotal(dayDto.getTotal().add(qty));
        }

        return new ArrayList<>(resultData.values());
    }

    @Override
    public List<HomeEnergyStatisticsDto> energy(productionStatisticsDto dto) {
        if (dto == null) {
            dto = new productionStatisticsDto();
            dto.setDateType(1);
        }

        LocalDate now = LocalDate.now();
        LocalDate startDate = null;

        if (dto.getDateType() != null && dto.getDateType() == 1) { // æœ¬æœˆè‡³ä»Š
            startDate = now.withDayOfMonth(1);
        } else { // æœ¬å¹´è‡³ä»Š
            startDate = now.withDayOfYear(1);
        }

        EnergyStatisticsVo vo = new EnergyStatisticsVo();
        vo.setStartDate(startDate);
        vo.setEndDate(now);

        List<EnergyCostDto> costDtos;
        String labelPattern;
        if (dto.getDateType() != null && dto.getDateType() == 1) { // æœ¬æœˆæŒ‰å¤©
            costDtos = energyConsumptionDetailMapper.energyCostDtos1(vo);
            labelPattern = "MM-dd";
        } else { // æœ¬å¹´æŒ‰æœˆ
            costDtos = energyConsumptionDetailMapper.energyCostDtos2(vo);
            labelPattern = "yy-MM";
        }

        List<String> dateLabels = new ArrayList<>();
        DateTimeFormatter labelFormatter = DateTimeFormatter.ofPattern(labelPattern);
        if (dto.getDateType() != null && dto.getDateType() == 1) {
            long days = ChronoUnit.DAYS.between(startDate, now) + 1;
            for (int i = 0; i < days; i++) {
                dateLabels.add(startDate.plusDays(i).format(labelFormatter));
            }
        } else {
            int currentMonth = now.getMonthValue();
            for (int i = 1; i <= currentMonth; i++) {
                dateLabels.add(startDate.withMonth(i).format(labelFormatter));
            }
        }

        Map<String, HomeEnergyStatisticsDto> resultData = new LinkedHashMap<>();
        for (String label : dateLabels) {
            HomeEnergyStatisticsDto item = new HomeEnergyStatisticsDto();
            item.setDateStr(label);
            resultData.put(label, item);
        }

        if (!CollectionUtils.isEmpty(costDtos)) {
            for (EnergyCostDto costDto : costDtos) {
                String dateStr = costDto.getMeterReadingDate();
                String label = "";
                try {
                    if (dto.getDateType() == 1) {
                        label = LocalDate.parse(dateStr).format(labelFormatter);
                    } else {
                        // yyyy-MM è½¬åŒ–为 yy-MM
                        label = YearMonth.parse(dateStr).format(labelFormatter);
                    }
                } catch (Exception e) {
                    label = dateStr;
                }

                if (resultData.containsKey(label)) {
                    HomeEnergyStatisticsDto dayDto = resultData.get(label);
                    BigDecimal water = costDto.getWaterConsumption() != null ? costDto.getWaterConsumption() : BigDecimal.ZERO;
                    BigDecimal electricity = costDto.getElectricityConsumption() != null ? costDto.getElectricityConsumption() : BigDecimal.ZERO;
                    BigDecimal steam = costDto.getGasConsumption() != null ? costDto.getGasConsumption() : BigDecimal.ZERO;
                    dayDto.setWater(water);
                    dayDto.setElectricity(electricity);
                    dayDto.setSteam(steam);
                }
            }
        }

        return new ArrayList<>(resultData.values());
    }
}