add 蒸汽整点数据报表关联计量设备名称

os-ems/src/main/java/com/os/ems/report/domain/EmsReportPointSteam.java

@@ -29,6 +29,12 @@ public class EmsReportPointSteam extends BaseEntity {
     @Excel(name = "计量设备编号")
     private String monitorCode;
 
+    /**
+     * 计量设备名称
+     */
+    @Excel(name = "计量设备名称")
+    private String monitorName;
+
     /**
      * 仪表值
      */
@@ -84,6 +90,14 @@ public class EmsReportPointSteam extends BaseEntity {
         return monitorCode;
     }
 
+    public String getMonitorName() {
+        return monitorName;
+    }
+
+    public void setMonitorName(String monitorName) {
+        this.monitorName = monitorName;
+    }
+
     public void setInstrumentValue(BigDecimal instrumentValue) {
         this.instrumentValue = instrumentValue;
     }
@@ -137,6 +151,7 @@ public class EmsReportPointSteam extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("objId", getObjId())
                 .append("monitorCode", getMonitorCode())
+                .append("monitorName", getMonitorName())
                 .append("instrumentValue", getInstrumentValue())
                 .append("expend", getExpend())
                 .append("recordTime", getRecordTime())

os-ems/src/main/resources/mapper/ems/report/EmsReportPointSteamMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="EmsReportPointSteam" id="EmsReportPointSteamResult">
         <result property="objId" column="obj_id"/>
         <result property="monitorCode" column="monitor_code"/>
+        <result property="monitorName" column="monitor_name"/>
         <result property="instrumentValue" column="instrument_value"/>
         <result property="expend" column="expend"/>
         <result property="recordTime" column="record_time"/>
@@ -20,44 +21,46 @@
     </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,
+               ebmi.monitor_name,
+               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
+        from ems_report_point_steam erps
+                 left join ems_base_monitor_info ebmi on erps.monitor_code = ebmi.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>
         </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"