From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 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 a3a1a15..a92007a 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
@@ -1,7 +1,8 @@
package org.jeecg.modules.mdc.service;
-import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
-import org.jeecg.modules.mdc.vo.MdcEfficiencyVo;
+import org.jeecg.modules.mdc.dto.ComparativeAnalysisDto;
+import org.jeecg.modules.mdc.dto.DayUtilizationRateDto;
+import org.jeecg.modules.mdc.vo.*;
/**
* @author: LiuS
@@ -19,11 +20,74 @@
MdcEfficiencyVo efficiencyList(String userId, MdcEfficiencyReportQueryVo vo);
/**
+ * 寮�鏈虹巼鎶ヨ〃
+ *
+ * @param userId
+ * @param vo
+ * @return
+ */
+ MdcEfficiencyVo efficiencyPOList(String userId, MdcEfficiencyReportQueryVo vo);
+
+ /**
* 鐝鍒╃敤鐜囨姤琛�
*
* @param userId
* @param vo
* @return
*/
- MdcEfficiencyVo shiftEfficiencyList(String userId, MdcEfficiencyReportQueryVo vo);
+ MdcEfficiencyShiftVo efficiencyShiftList(String userId, MdcEfficiencyReportShiftQueryVo vo);
+
+ /**
+ * 缁熻鍒嗘瀽鍒楄〃
+ *
+ * @param userId
+ * @param vo
+ * @return
+ */
+ StatisticalAnalysisVo dayStatisticalRate(String userId, MdcEfficiencyReportQueryVo vo);
+
+ /**
+ * 瀵规瘮鍒嗘瀽
+ *
+ * @param userId
+ * @param vo
+ * @return
+ */
+ ComparativeAnalysisDto comparativeAnalysis(String userId, ComparativeAnalysisQueryVo vo);
+
+ /**
+ * 璁惧鏃ュ埄鐢ㄧ巼鍒嗘璁＄畻
+ *
+ * @param userId
+ * @param vo
+ * @return
+ */
+ DayUtilizationRateDto dayUtilizationRate(String userId, DayUtilizationRateQueryVo vo);
+
+ /**
+ * 璁惧鏃ュ埄鐢ㄧ巼瀵规瘮璁＄畻
+ *
+ * @param userId
+ * @param vo
+ * @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);
}
--
Gitblit v1.9.3