From 8e1b723246ffa0d3dc39cf162b41bfe9bac72a4b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 23 二月 2024 14:46:58 +0800
Subject: [PATCH] 报表添加驱动类型查询
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java | 5 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java | 5 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 9 +++++++++
3 files changed, 19 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 5320b97..10cdba9 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
@@ -28,6 +28,9 @@
<if test="vo.equipmentType != null and vo.equipmentType != '' ">
AND t2.equipment_type = #{ vo.equipmentType }
</if>
+ <if test="vo.driveType != null and vo.driveType != '' ">
+ AND t2.drive_type = #{driveType}
+ </if>
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND t2.equipment_id IN
<foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
@@ -65,6 +68,9 @@
AND t1.the_date >= #{ vo.startTime }
<if test="vo.equipmentType != null and vo.equipmentType != '' ">
AND t2.equipment_type = #{ vo.equipmentType }
+ </if>
+ <if test="vo.driveType != null and vo.driveType != '' ">
+ AND t2.drive_type = #{driveType}
</if>
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND t2.equipment_id IN
@@ -110,6 +116,9 @@
<if test="vo.equipmentType != null and vo.equipmentType != '' ">
AND t2.equipment_type = #{ vo.equipmentType }
</if>
+ <if test="vo.driveType != null and vo.driveType != '' ">
+ AND t2.drive_type = #{driveType}
+ </if>
</where>
GROUP BY
t2.equipment_id,
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
index e6ffd89..04db1e5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
@@ -46,4 +46,9 @@
*/
private String equipmentType;
+ /**
+ * 椹卞姩绫诲瀷
+ */
+ private String driveType;
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
index 221e89e..3e55858 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
@@ -49,4 +49,9 @@
*/
private String equipmentType;
+ /**
+ * 椹卞姩绫诲瀷
+ */
+ private String driveType;
+
}
--
Gitblit v1.9.3