From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index 6ca6931..0a1d0b9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -5,6 +5,7 @@
         SELECT
             t1.id,
             t1.err_uda1 errUda1,
+            t1.err_uda2 errUda2,
             t1.num num,
             t1.equipment_id equipmentId,
             t1.fault_reason faultReason,
@@ -49,18 +50,57 @@
         <if test="params.equipmentId != null and params.equipmentId != ''">
             and t1.equipment_id = #{params.equipmentId}
         </if>
+        <if test="params.faultDescription != null and params.faultDescription != ''">
+            and t1.fault_description like concat('%',#{params.faultDescription},'%')
+        </if>
+        <if test="params.faultStartTime != null and params.faultStartTime != ''">
+            and t1.fault_time &gt;= #{params.faultStartTime}
+        </if>
+        <if test="params.faultEndTime != null and params.faultEndTime != ''">
+            and t1.fault_time &lt;= #{params.faultEndTime}
+        </if>
+        <if test="params.isStop != null and params.isStop != ''">
+            and t1.is_stop = #{params.isStop}
+        </if>
+        <if test="params.status != null and params.status != ''">
+            and t1.status = #{params.status}
+        </if>
+        <if test="params.errUda2 != null and params.errUda2 != ''">
+            and t1.err_uda2 like concat('%',#{params.errUda2},'%')
+        </if>
+        <if test="params.errUda1 != null and params.errUda1 != ''">
+            and t1.err_uda1 = #{params.errUda1}
+        </if>
+        <if test="params.isStop != null and params.isStop != ''">
+            and t1.is_stop  = #{params.isStop}
+        </if>
+        <if test="params.createBy!= null and params.createBy != ''">
+            and t1.create_by like concat('%',#{params.createBy},'%')
+        </if>
         <if test="params.equipmentNum != null and params.equipmentNum != ''">
             and t2.num like concat('%',#{params.equipmentNum},'%')
         </if>
         <if test="params.equipmentName != null and params.equipmentName != ''">
             and t2.name like concat('%',#{params.equipmentName},'%')
         </if>
-        <if test="params.status != null and params.status != ''">
-            and t1.status = #{params.status}
+        <if test="params.model != null and params.model != ''">
+            and t2.model like concat('%',#{params.model},'%')
+        </if>
+        <if test="params.specification != null and params.specification != ''">
+            and t2.specification like concat('%',#{params.specification},'%')
+        </if>
+        <if test="params.useId != null and params.useId != ''">
+            and t2.use_id  = #{params.useId}
         </if>
         <if test="params.teamId != null and params.teamId != ''">
             and t2.team_id = #{params.teamId}
         </if>
+        <if test="equipNums.size!=0">
+            and t2.num in
+            <foreach collection="equipNums" open="(" separator="," close=")" item="num">
+                #{num}
+            </foreach>
+        </if>
         ORDER BY t1.create_time desc
     </select>
 </mapper>

--
Gitblit v1.9.3