添加报表查询功能

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;//一次网回水温度
+
+
 
 }

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>