From 4f67318363fc9cb302a7cb54b7df10993e9bc837 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 25 Nov 2024 11:14:21 +0800
Subject: [PATCH] =?UTF-8?q?add(os-ems):=20=E8=92=B8=E6=B1=BD=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AE=A1=E9=87=8F=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 EmsReportPointSteam 模型中添加 monitorName 字段
- 更新 SQL 查询以加入 monitor_name 的查询和筛选
- 优化查询语句，使用别名区分不同表的字段
- 添加 monitor_name 字段到结果映射
---
 .../report/domain/EmsReportPointSteam.java    | 16 +++++++
 .../ems/report/EmsReportPointSteamMapper.xml  | 46 ++++++++++---------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/os-ems/src/main/java/com/os/ems/report/domain/EmsReportPointSteam.java b/os-ems/src/main/java/com/os/ems/report/domain/EmsReportPointSteam.java
index b5809ab..6e1de86 100644
--- a/os-ems/src/main/java/com/os/ems/report/domain/EmsReportPointSteam.java
+++ b/os-ems/src/main/java/com/os/ems/report/domain/EmsReportPointSteam.java
@@ -68,6 +68,12 @@ public class EmsReportPointSteam extends BaseEntity {
     @Excel(name = "修改标识", readConverterExp = "0=是,1=否")
     private String updateFlag;
 
+
+    /** 计量设备名称 */
+    @Excel(name = "计量设备名称")
+    private String monitorName;
+
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }
@@ -132,6 +138,15 @@ public class EmsReportPointSteam extends BaseEntity {
         return updateFlag;
     }
 
+
+    public String getMonitorName() {
+        return monitorName;
+    }
+
+    public void setMonitorName(String monitorName) {
+        this.monitorName = monitorName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -147,6 +162,7 @@ public class EmsReportPointSteam extends BaseEntity {
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
+                .append("monitorName", getMonitorName())
                 .toString();
     }
 }
diff --git a/os-ems/src/main/resources/mapper/ems/report/EmsReportPointSteamMapper.xml b/os-ems/src/main/resources/mapper/ems/report/EmsReportPointSteamMapper.xml
index ddfed24..00c3230 100644
--- a/os-ems/src/main/resources/mapper/ems/report/EmsReportPointSteamMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/report/EmsReportPointSteamMapper.xml
@@ -17,47 +17,51 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="monitorName" column="monitor_name"/>
     </resultMap>
 
     <sql id="selectEmsReportPointSteamVo">
-        select obj_id,
-               monitor_code,
-               instrument_value,
-               expend,
-               record_time,
-               begin_time,
-               end_time,
-               update_flag,
-               create_by,
-               create_time,
-               update_by,
-               update_time
-        from ems_report_point_steam
+        select erps.obj_id,
+               erps.monitor_code,
+               erps.instrument_value,
+               erps.expend,
+               erps.record_time,
+               erps.begin_time,
+               erps.end_time,
+               erps.update_flag,
+               erps.create_by,
+               erps.create_time,
+               erps.update_by,
+               erps.update_time,
+               ebm.monitor_name
+        from ems_report_point_steam erps
+        left join  ems_base_monitor_info ebm on erps.monitor_code = ebm.monitor_code
     </sql>
 
     <select id="selectEmsReportPointSteamList" parameterType="EmsReportPointSteam"
             resultMap="EmsReportPointSteamResult">
         <include refid="selectEmsReportPointSteamVo"/>
         <where>
-            <if test="monitorCode != null  and monitorCode != ''">and monitor_code = #{monitorCode}</if>
-            <if test="instrumentValue != null ">and instrument_value = #{instrumentValue}</if>
-            <if test="expend != null ">and expend = #{expend}</if>
+            <if test="monitorCode != null  and monitorCode != ''">and erps.monitor_code = #{monitorCode}</if>
+            <if test="instrumentValue != null ">and erps.instrument_value = #{instrumentValue}</if>
+            <if test="expend != null ">and erps.expend = #{expend}</if>
             <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
-                and record_time between #{params.beginRecordTime} and #{params.endRecordTime}
+                and erps.record_time between #{params.beginRecordTime} and #{params.endRecordTime}
             </if>
             <if test="params.beginBeginTime != null and params.beginBeginTime != '' and params.endBeginTime != null and params.endBeginTime != ''">
-                and begin_time between #{params.beginBeginTime} and #{params.endBeginTime}
+                and erps.begin_time between #{params.beginBeginTime} and #{params.endBeginTime}
             </if>
             <if test="params.beginEndTime != null and params.beginEndTime != '' and params.endEndTime != null and params.endEndTime != ''">
-                and end_time between #{params.beginEndTime} and #{params.endEndTime}
+                and erps.end_time between #{params.beginEndTime} and #{params.endEndTime}
             </if>
-            <if test="updateFlag != null  and updateFlag != ''">and update_flag = #{updateFlag}</if>
+            <if test="updateFlag != null  and updateFlag != ''">and erps.update_flag = #{updateFlag}</if>
+            <if test="monitorName != null  and monitorName != ''">and ebm.monitor_name like concat('%', #{monitorName}, '%')</if>
         </where>
     </select>
 
     <select id="selectEmsReportPointSteamByObjId" parameterType="Long" resultMap="EmsReportPointSteamResult">
         <include refid="selectEmsReportPointSteamVo"/>
-        where obj_id = #{objId}
+        where erps.obj_id = #{objId}
     </select>
 
     <insert id="insertEmsReportPointSteam" parameterType="EmsReportPointSteam" useGeneratedKeys="true"