From a6db8d15d8e33f35c9f907edbf172a0f3382c27a Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 22 八月 2024 14:17:37 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
index 753148b..e86cee4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
@@ -14,11 +14,11 @@
<if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
</if>
- <if test="equipmentElectricStatisticalVo.axisType != null and equipmentElectricStatisticalVo.axisType != ''">
- AND axisType = #{equipmentElectricStatisticalVo.axisType}
+ <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
+ AND axisType = #{equipmentElectricStatisticalVo.axistype}
</if>
<if test="equipmentElectricStatisticalVo.createDate != null and equipmentElectricStatisticalVo.createDate != ''">
- AND createDate LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.createDate}),'%')
+ AND createDate = #{equipmentElectricStatisticalVo.createDate}
</if>
<if test="equipmentElectricStatisticalVo.equipmentIdList != null and equipmentElectricStatisticalVo.equipmentIdList.size() > 0">
AND equipmentID IN
@@ -42,11 +42,11 @@
<if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
</if>
- <if test="equipmentElectricStatisticalVo.axisType != null and equipmentElectricStatisticalVo.axisType != ''">
- AND axisType = #{equipmentElectricStatisticalVo.axisType}
+ <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
+ AND axisType = #{equipmentElectricStatisticalVo.axistype}
</if>
<if test="equipmentElectricStatisticalVo.createDate != null and equipmentElectricStatisticalVo.createDate != ''">
- AND createDate LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.createDate}),'%')
+ AND createDate = #{equipmentElectricStatisticalVo.createDate}
</if>
<if test="equipmentElectricStatisticalVo.equipmentIdList != null and equipmentElectricStatisticalVo.equipmentIdList.size() > 0">
AND equipmentID IN
@@ -70,8 +70,8 @@
<if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
</if>
- <if test="equipmentElectricStatisticalVo.axisType != null and equipmentElectricStatisticalVo.axisType != ''">
- AND axisType = #{equipmentElectricStatisticalVo.axisType}
+ <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
+ AND axisType = #{equipmentElectricStatisticalVo.axistype}
</if>
<if test="equipmentElectricStatisticalVo.startDate != null and equipmentElectricStatisticalVo.startDate != '' and equipmentElectricStatisticalVo.endDate != null and equipmentElectricStatisticalVo.endDate != ''">
AND createDate BETWEEN #{equipmentElectricStatisticalVo.startDate} AND #{ equipmentElectricStatisticalVo.endDate }
@@ -85,4 +85,9 @@
</where>
ORDER BY id ASC
</select>
+
+ <!--鏍规嵁璁惧id鑾峰彇鏈�鏂颁竴鏉℃暟鎹�-->
+ <select id="getMaxDate" resultType="java.util.Date">
+ SELECT MAX( createDate ) createDate FROM equipment_electric_statistical WHERE equipmentID = #{equipmentId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3