refactor(home): 优化产品进出库分析功能的数据库查询逻辑

云

14 小时以前 d90a45a49ddb0ae512ef97b5e6fc981caab5e158

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

@@ -1088,26 +1088,18 @@

    @Override
    public List<Map<String, Object>> productInOutAnalysis(Integer type) {
        String targetName;
        if (type == 1) {
            targetName = "原材料";
        // 1=原材料 2=成品 3=半成品，与前端 ProductTypeSwitch 取值一致；
        // 范围判定改为按分类树根节点的 product_type，兼容原材料多个根分类及成品多级分类
        String productScope;
        if (type == null || type == 1) {
            productScope = "原材料";
        } else if (type == 2) {
            targetName = "成品";
            productScope = "成品";
        } else if (type == 3) {
            targetName = "半成品";
            productScope = "半成品";
        } else {
            return new ArrayList<>();
        }

        LambdaQueryWrapper<Product> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Product::getProductName, targetName).isNull(Product::getParentId);
        Product rootCategory = productMapper.selectOne(queryWrapper);

        if (rootCategory == null) {
            log.warn("未找到名称为 {} 的顶级产品分类", targetName);
            return new ArrayList<>();
        }
        Long rootCategoryId = rootCategory.getId();

        LocalDate now = LocalDate.now();
        DateTimeFormatter displayDtf = DateTimeFormatter.ofPattern("M/d");
@@ -1115,10 +1107,10 @@
        String startDate = now.minusDays(6).toString();
        String endDate = now.toString();

        List<Map<String, Object>> inCounts = stockInventoryMapper.selectDailyStockInCounts(rootCategoryId, startDate,
        List<Map<String, Object>> inCounts = stockInventoryMapper.selectDailyStockInCounts(productScope, startDate,
                endDate + " 23:59:59");

        List<Map<String, Object>> outCounts = stockInventoryMapper.selectDailyStockOutCounts(rootCategoryId, startDate,
        List<Map<String, Object>> outCounts = stockInventoryMapper.selectDailyStockOutCounts(productScope, startDate,
                endDate + " 23:59:59");

        Map<LocalDate, BigDecimal> inMap = inCounts.stream()