Merge remote-tracking branch 'origin/dev_New' into dev_New

yaowanxin

14 小时以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

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

@@ -1,9 +1,8 @@
package com.ruoyi.home.service;

import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.dto.MapDto;
import com.ruoyi.home.dto.*;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductWorkOrderDto;

import java.text.ParseException;
import java.util.List;
@@ -31,6 +30,38 @@

    Long noticesCount();

     ProductionProgressDto productionProgress();
     Map<Integer, List<ProductWorkOrderDto>> workInProcessTurnover();
    ProductionProgressDto productionProgress();
    ProductionTurnoverDto workInProcessTurnover();

    DeptStaffDistributionDto deptStaffDistribution();

    HomeSummaryDto summaryStatistics();

    List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type);

    CustomerRevenueAnalysisDto customerRevenueAnalysis(Long customerId, Integer type);

    ProductCategoryDistributionDto productCategoryDistribution();

    List<CustomerContributionRankingDto> customerContributionRanking(Integer type);

    List<MapDto> productSalesAnalysis();

    List<MapDto> rawMaterialPurchaseAmountRatio();

    List<MapDto> salesPurchaseStorageProductCount();

    List<Map<String, Object>> productInOutAnalysis(Integer type);

    List<MapDto> productTurnoverDays();

    List<Map<String, Object>> incomeExpenseAnalysis(Integer type);

    List<MapDto> profitTrendAnalysis();

    List<MapDto> expenseCompositionAnalysis(Integer type);

    MonthlyIncomeDto monthlyIncome();

    MonthlyExpenditureDto monthlyExpenditure();
}