From c8673cbde4538b109e43042dc93cf33c46dca37e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 31 十二月 2024 10:56:57 +0800
Subject: [PATCH] 每日排产计划修改

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 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 f00abf2..405a6bd 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
@@ -9,13 +9,13 @@
             equipment_electric_statistical
         <where>
             <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
-                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+                AND equipmentID  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
             </if>
             <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
-                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+                AND equipmentName  LIKE '%' +#{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 = #{equipmentElectricStatisticalVo.createDate}
@@ -37,13 +37,13 @@
             equipment_electric_statistical
         <where>
             <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
-                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+                AND equipmentID  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
             </if>
             <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
-                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+                AND equipmentName  LIKE '%' + #{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 = #{equipmentElectricStatisticalVo.createDate}
@@ -65,13 +65,13 @@
             equipment_electric_statistical
         <where>
             <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
-                AND equipmentID  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+                AND equipmentID  LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
             </if>
             <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
-                AND equipmentName  LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+                AND equipmentName  LIKE '%' + #{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