From a42360036c374da5cd384d69b3dc0157f7f52b5f Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 28 Oct 2025 10:15:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/heating/entity/Heatanalysis.java |  6 ++++++
 .../modules/heating/mapper/xml/HeatanalysisMapper.xml  | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java
index bbe1474..5b7f8d8 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java
@@ -136,5 +136,11 @@ public class Heatanalysis extends JeecgEntity {
 	private String faultLevel;		// 故障等级
 
 
+	@TableField(exist = false)
+	private String ycwgswd;//一次网供水温度
+	@TableField(exist = false)
+	private String ycwhswd;//一次网回水温度
+
+
 
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
index 919ed68..8f1a73f 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
@@ -150,6 +150,16 @@
                 <if test="params.faultLevel != null and params.faultLevel != ''">
                     AND a.fault_level = #{params.faultLevel}
                 </if>
+
+                <if test="params.faultLevel != null and params.faultLevel != ''">
+                    AND a.fault_level = #{params.faultLevel}
+                </if>
+                <if test="params.ycwgswd != null and params.ycwgswd != ''">
+                    AND ((a.view005 - 0 !=0 and a.view005 - 0 &lt;= ${params.ycwgswd} ) or (a.view035 - 0 !=0 and a.view035 - 0 &lt;= ${params.ycwgswd} ) )
+                </if>
+                <if test="params.ycwhswd != null and params.ycwhswd != ''">
+                    AND ((a.view006 - 0 !=0 and a.view006 - 0 &lt;= ${params.ycwhswd} ) or (a.view036 - 0 !=0 and a.view036 - 0 &lt;= ${params.ycwhswd} ) )
+                </if>
             </where>
         ) t
         <where>