From b529d8282b21a863eafa1f2dffa8bfe25175caa3 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 23 May 2024 13:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E6=94=AF=E6=A8=A1=E6=B5=8B=E9=87=8Fbu?=
 =?UTF-8?q?g=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/HighFormworkAlarmData.java         | 27 ++++++++++++++-----
 .../mapper/HighFormworkAlarmDataMapper.java   |  2 +-
 .../xml/HighFormworkAlarmDataMapper.xml       | 22 +++++++++------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
index 329fd6f28..84a5d264c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
@@ -66,15 +66,28 @@ public class HighFormworkAlarmData implements Serializable {
     @ApiModelProperty(value = "项目SN")
     private java.lang.String projectSn;
 
-    @ApiModelProperty(value = "测量点名称")
-    @TableField(exist = false)
-    private java.lang.String measurePointName;
+	@ApiModelProperty(value = "测量点名称")
+	@TableField(exist = false)
+	private java.lang.String measurePointName;
 
-    @TableField(exist = false)
-    private java.lang.String createTime_begin;
+	@TableField(exist = false)
+	private java.lang.String createTime_begin;
 
-    @TableField(exist = false)
-    private java.lang.String createTime_end;
+	@TableField(exist = false)
+	private java.lang.String createTime_end;
+
+	/**
+	 * 测量点编号
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "测量点编号")
+	private java.lang.String measurePointNumber;
+	/**
+	 * 采集仪编号
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "采集仪编号")
+	private java.lang.String acquisitionInstrumentNumber;
 
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkAlarmDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkAlarmDataMapper.java
index 215721842..12ddcc0e9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkAlarmDataMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkAlarmDataMapper.java
@@ -21,7 +21,7 @@ import java.util.Map;
 @Mapper
 public interface HighFormworkAlarmDataMapper extends BaseMapper<HighFormworkAlarmData> {
 
-    IPage<HighFormworkAlarmData> queryPageList(Page<HighFormworkAlarmData> page, @Param("q") HighFormworkAlarmData highFormworkAlarmData);
+    IPage<HighFormworkAlarmData> queryPageList(Page<HighFormworkAlarmData> page, @Param("param") HighFormworkAlarmData highFormworkAlarmData);
 
     List<NumberDifferentTypesAlarmsRadarChartOneMonthVo> getNumberDifferentTypesAlarmsRadarChartOneMonth(Map<String, Object> map);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
index 40a0834e7..a267fdbbd 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
@@ -6,16 +6,22 @@
         FROM `high_formwork_alarm_data` hfad
         INNER JOIN high_formwork_measure_point hfmp ON hfmp.id = hfad.measure_point_id
         <where>
-            <if test="q.projectSn != null and q.projectSn != ''">
-                and hfmp.project_sn = #{q.projectSn}
+            <if test="param.projectSn != null and param.projectSn != ''">
+                and hfmp.project_sn = #{param.projectSn}
             </if>
-            <if test="param2.createTime_begin != null and param2.createTime_begin != ''">
-                and hfad.create_time >= #{param2.createTime_begin}
+            <if test="param.createTime_begin != null and param.createTime_begin != ''">
+                and hfad.create_time >= #{param.createTime_begin}
             </if>
-            <if test="param2.createTime_end != null and param2.createTime_end != ''">
-                and hfad.create_time >= #{param2.createTime_end}
-                and hfad.create_time <![CDATA[<=]]> if(LENGTH(#{param2.createTime_end}) = 10,
-                CONCAT(DATE_FORMAT(#{param2.createTime_end}, '%Y-%m-%d'), ' 23:59:59'), #{param2.createTime_end})
+            <if test="param.createTime_end != null and param.createTime_end != ''">
+                and hfad.create_time >= #{param.createTime_end}
+                and hfad.create_time <![CDATA[<=]]> if(LENGTH(#{param.createTime_end}) = 10,
+                CONCAT(DATE_FORMAT(#{param.createTime_end}, '%Y-%m-%d'), ' 23:59:59'), #{param.createTime_end})
+            </if>
+            <if test="param.acquisitionInstrumentNumber != null and param.acquisitionInstrumentNumber != ''">
+                and hfmp.acquisition_instrument_number = #{param.acquisitionInstrumentNumber}
+            </if>
+            <if test="param.measurePointNumber != null and param.measurePointNumber != ''">
+                and hfmp.measure_point_number = #{param.measurePointNumber}
             </if>
         </where>
         order by hfad.create_time desc