From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml
index cc290c6..182be09 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml
@@ -12,7 +12,6 @@
             t1.equipment_id equipmentId,
             MAX(t1.equipment_name) equipmentName,
             MAX(t2.drive_type) driveType,
-            t1.the_date theDate,
             t1.sequence_number sequenceNumber,
             COUNT(*) processCount,
             SUM(t1.duration) duration
@@ -29,6 +28,12 @@
             <if test="mdcProcessCountVo.driveType != null and mdcProcessCountVo.driveType != ''">
                 AND t2.drive_type = #{ mdcProcessCountVo.driveType }
             </if>
+            <if test="mdcProcessCountVo.deviceLevel != null and mdcProcessCountVo.deviceLevel != ''">
+                AND t2.device_level = #{ mdcProcessCountVo.deviceLevel }
+            </if>
+            <if test="mdcProcessCountVo.deviceCategory != null and mdcProcessCountVo.deviceCategory != ''">
+                AND t2.device_category = #{ mdcProcessCountVo.deviceCategory }
+            </if>
             <if test="mdcProcessCountVo.startTime != null and mdcProcessCountVo.startTime != '' and mdcProcessCountVo.endTime != '' and mdcProcessCountVo.endTime != null">
                 AND t1.the_date BETWEEN #{ mdcProcessCountVo.startTime } AND #{ mdcProcessCountVo.endTime }
             </if>
@@ -41,7 +46,6 @@
         </where>
         GROUP BY
             t1.equipment_id,
-            t1.the_date,
             t1.sequence_number
     </select>
 
@@ -53,4 +57,14 @@
         WHERE
             equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%')
     </select>
+
+
+    <select id="findCount" resultType="java.math.BigDecimal">
+        SELECT
+            count(*)
+        FROM
+            mdc_process_count
+        WHERE
+            equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%')
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3