From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 10 七月 2025 10:43:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java index abfd3f9..0a81a8b 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java @@ -3,6 +3,10 @@ import org.jeecg.modules.mdc.dto.ComparativeAnalysisDto; import org.jeecg.modules.mdc.dto.DayUtilizationRateDto; import org.jeecg.modules.mdc.vo.*; +import org.springframework.web.servlet.ModelAndView; + +import java.math.BigDecimal; +import java.util.List; /** * @author: LiuS @@ -72,4 +76,39 @@ * @return */ DayUtilizationRateDto dayUtilizationRateContrast(String userId, DayUtilizationRateContrastQueryVo vo); + + /** + * 璁惧鍒╃敤鐜囧垎娈靛垎鏋� + * + * @param userId + * @param vo + * @return + */ + MdcUtilizationRateDto utilizationRateSectionAnalyze(String userId, DayUtilizationRateContrastQueryVo vo); + + /** + * 璁惧鍒╃敤鐜囪蛋鍔垮垎鏋� + * + * @param userId + * @param vo + * @return + */ + MdcUtilizationRateDto utilizationRateTrendAnalyze(String userId, DayUtilizationRateContrastQueryVo vo); + + /** + * 鑾峰彇鍒╃敤鐜� + * + * @param equipmentId + * @param date + * @return + */ + List<BigDecimal> getEfficiencyRate(String equipmentId, String date); + + /** + * 鍒╃敤鐜囧垪琛ㄥ鍑� + * + * @param vo + * @return + */ + ModelAndView exportEfficiencyXls(MdcEfficiencyReportQueryVo vo); } -- Gitblit v1.9.3