From 80cabc1fec87b8f8cf8026ae1a5c14aa2cab4527 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 08 五月 2025 17:52:11 +0800
Subject: [PATCH] update

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml
index 2e1c915..13a415c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml
@@ -28,22 +28,27 @@
         ORDER BY the_date DESC, equipment_id ASC
     </select>
 
-    <select id="findByEquIdsAndDate" resultType="java.math.BigDecimal">
+    <select id="findByEquIdsAndDate" resultType="org.jeecg.modules.mdc.entity.MdcOeeInfo">
         SELECT
-            AVG ( oee )
+            the_date,
+            AVG ( oee ) oee
         FROM
             mdc_oee_info
         <where>
-            the_date = #{date}
+            the_date BETWEEN #{start} AND #{end}
             AND equipment_id IN
             <foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                 #{ id }
             </foreach>
         </where>
+        GROUP BY
+            the_date
+        ORDER BY
+            the_date
     </select>
 
-    <select id="findByEquIdAndDate" resultType="java.math.BigDecimal">
-        SELECT oee FROM mdc_oee_info WHERE the_date = #{date} AND equipment_id = #{equipmentId}
+    <select id="findByEquIdAndDate" resultType="org.jeecg.modules.mdc.entity.MdcOeeInfo">
+        SELECT * FROM mdc_oee_info WHERE the_date BETWEEN #{start} AND #{end} AND equipment_id = #{equipmentId} ORDER BY the_date
     </select>
 
     <select id="findByEquIdAndMonth" resultType="java.math.BigDecimal">

--
Gitblit v1.9.3