From e65c0249b66ffd1a4f96752a0f4a86f4f2e01314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 05 三月 2025 14:00:10 +0800
Subject: [PATCH] 利用率分析页面添加筛选条件
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 22 +++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java | 16 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/DayUtilizationRateContrastQueryVo.java | 21 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 12 ++++++
4 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
index 40631f8..5ba9404 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -182,6 +182,18 @@
<if test="vo.driveType != null and vo.driveType != null">
AND me.drive_type = #{ vo.driveType }
</if>
+ <if test="vo.equipmentType != null and vo.equipmentType != '' ">
+ AND me.equipment_type = #{ vo.equipmentType }
+ </if>
+ <if test="vo.deviceLevel != null and vo.deviceLevel != '' ">
+ AND me.device_level = #{vo.deviceLevel}
+ </if>
+ <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
+ AND me.device_category = #{vo.deviceCategory}
+ </if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND me.device_importance_level = #{vo.deviceImportanceLevel}
+ </if>
AND mesi.the_date BETWEEN #{ vo.startTime } AND #{ vo.endTime }
</where>
GROUP BY
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 f6a2e6d..6575ebd 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
@@ -15,6 +15,7 @@
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -1599,6 +1600,17 @@
if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
result.setMdcEfficiencyList(listDtos);
} else {
+
+ MdcEfficiencyReportQueryVo vo1 = new MdcEfficiencyReportQueryVo();
+ BeanUtils.copyProperties(vo, vo1);
+ List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo1);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ vo.setEquipmentIdList(equipmentIdList);
+ } else {
+ result.setMdcEfficiencyList(listDtos);
+ return result;
+ }
+
// 鍒╃敤鐜囩瓑绾�
List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");
@@ -1691,6 +1703,16 @@
if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
result.setMdcEfficiencyList(listDtos);
} else {
+ MdcEfficiencyReportQueryVo vo1 = new MdcEfficiencyReportQueryVo();
+ BeanUtils.copyProperties(vo, vo1);
+ List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo1);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ vo.setEquipmentIdList(equipmentIdList);
+ } else {
+ result.setMdcEfficiencyList(listDtos);
+ return result;
+ }
+
// 鍒╃敤鐜囩瓑绾�
List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");
if ("2".equals(vo.getTypeTree())) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java
index 09cbd35..a65aa7f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java
@@ -41,4 +41,20 @@
* 璁惧ids
*/
private List<String> equipmentIdList;
+ /**
+ * 璁惧绫诲瀷
+ */
+ private String equipmentType;
+ /**
+ * 璁惧绾у埆
+ */
+ private String deviceLevel;
+ /**
+ * 璁惧绉嶇被
+ */
+ private String deviceCategory;
+ /**
+ * 閲嶈绋嬪害
+ */
+ private Integer deviceImportanceLevel;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/DayUtilizationRateContrastQueryVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/DayUtilizationRateContrastQueryVo.java
index a84b779..db37670 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/DayUtilizationRateContrastQueryVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/DayUtilizationRateContrastQueryVo.java
@@ -44,5 +44,26 @@
* 璁惧ids
*/
private List<String> equipmentIdList;
+ /**
+ * 璁惧绫诲瀷
+ */
+ private String equipmentType;
+
+ /**
+ * 椹卞姩绫诲瀷
+ */
+ private String driveType;
+ /**
+ * 璁惧绾у埆
+ */
+ private String deviceLevel;
+ /**
+ * 璁惧绉嶇被
+ */
+ private String deviceCategory;
+ /**
+ * 閲嶈绋嬪害
+ */
+ private Integer deviceImportanceLevel;
}
--
Gitblit v1.9.3