From 3f61152272e9694f98bb5fdba755e4f7ceddbb31 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 03 七月 2023 11:06:00 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java | 6 +++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 9 ++++++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java | 4 +++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java | 5 -----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java | 9 +++++++++
6 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
index 1dcddd9..2016911 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java
@@ -45,7 +45,7 @@
public Result shiftEfficiencyList(MdcEfficiencyReportQueryVo vo) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- MdcEfficiencyVo result = mdcEfficiencyReportService.efficiencyList(userId, vo);
+ MdcEfficiencyVo result = mdcEfficiencyReportService.shiftEfficiencyList(userId, vo);
return Result.OK(result);
}
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 0471926..a3a1a15 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
@@ -17,4 +17,13 @@
* @return
*/
MdcEfficiencyVo efficiencyList(String userId, MdcEfficiencyReportQueryVo vo);
+
+ /**
+ * 鐝鍒╃敤鐜囨姤琛�
+ *
+ * @param userId
+ * @param vo
+ * @return
+ */
+ MdcEfficiencyVo shiftEfficiencyList(String userId, MdcEfficiencyReportQueryVo vo);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
index fca4f01..20edc75 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
@@ -69,7 +69,9 @@
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
}
}
- mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
+ if (mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) {
+ mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
+ }
return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index fff89eb..d673d47 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -72,7 +72,9 @@
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
}
}
- vo.setEquipmentIdList(equipmentIds);
+ if (vo.getEquipmentIdList().isEmpty()) {
+ vo.setEquipmentIdList(equipmentIds);
+ }
// 鏌ヨ鍒╃敤鐜囨暟鎹�
List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo);
@@ -103,6 +105,11 @@
return result;
}
+ @Override
+ public MdcEfficiencyVo shiftEfficiencyList(String userId, MdcEfficiencyReportQueryVo vo) {
+ return null;
+ }
+
private MdcEfficiencyResultDto efficiencyRate(List<MdcEfficiencyDto> efficiencyList, String date, MdcEquipment mdcEquipment, List<MdcUtilizationRate> mdcUtilizationRateList) {
MdcEfficiencyResultDto mdcEfficiencyResultDto = new MdcEfficiencyResultDto();
if (efficiencyList != null && !efficiencyList.isEmpty()) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java
index 750bb09..4e1c90c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java
@@ -155,7 +155,11 @@
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
}
}
- repair.setMdcSectionIds(equipmentIds);
+
+ if (repair.getMdcSectionIds().isEmpty()) {
+ repair.setMdcSectionIds(equipmentIds);
+ }
+
return this.baseMapper.pageList(page, repair);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java
index c03970b..cee9a2a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java
@@ -17,10 +17,5 @@
*/
private List<MdcEfficiencyListDto> mdcEfficiencyList;
-// /**
-// * 鍒╃敤鐜囨暟鎹�
-// */
-// private List<MdcEfficiencyDto> list;
-
private List<String> dates;
}
--
Gitblit v1.9.3