From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 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 7ecd404..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
@@ -28,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>
--
Gitblit v1.9.3