0918优化-电表报表-尖峰平谷日差值显示

ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml

@@ -885,11 +885,23 @@
     </select>
 
     <select id="getYestLatestDate" resultMap="EmsAmmeterDataResult">
-        <include refid="selectEmsAmmeterDataVo"/>
-        where site_id = #{siteId}
+        SELECT
+            t.current_forward_active_total,
+            t.current_reverse_active_total,
+            t.current_forward_active_peak,
+            t.current_forward_active_high,
+            t.current_forward_active_flat,
+            t.current_forward_active_valley,
+            t.current_reverse_active_peak,
+            t.current_reverse_active_high,
+            t.current_reverse_active_flat,
+            t.current_reverse_active_valley
+        FROM ems_ammeter_data t
+        WHERE  site_id = #{siteId}
         and device_id = #{deviceId}
-        and DATE(data_update_time) = #{yestData}
-        order by data_update_time desc limit 1
+        AND data_update_time &lt;= #{yestData}
+        ORDER BY data_update_time DESC
+        LIMIT 1
     </select>
 
     <select id="getMonthlyTimeRanges" resultType="com.xzzn.ems.domain.vo.MonthlyTimeRange">