admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
Administrator 2023-06-28 21:56:18 +08:00
parent 08d3795f5b
commit 0f6b12cde2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterMonthRecordMapper.xml
View File

@ -39,21 +39,21 @@
<select id="selectWaterMeterMonthRecordByMeterNo" resultType="java.util.Map"> <select id="selectWaterMeterMonthRecordByMeterNo" resultType="java.util.Map">
SELECT a.water_meter_no waterMeterNo, SELECT a.water_meter_no waterMeterNo,
IFNULL(b.water_tonnage, 0) endWaterVolume, IFNULL(b.water_tonnage, 0) endWaterVolume,
IFNULL(b.water_tonnage, 0) - IFNULL(c.end_water_volume, 0) useWater, IFNULL(b.water_tonnage, 0) - IFNULL(c.end_water_volume, 0) useWater,
DATE_FORMAT(NOW(), "%Y-%m") monthTime, DATE_FORMAT(NOW(), "%Y-%m") monthTime,
a.project_sn projectSn, a.project_sn projectSn,
IFNULL(c.end_water_volume, 0) startWaterVolume IFNULL(c.end_water_volume, 0) startWaterVolume
from water_meter a from water_meter a
LEFT JOIN LEFT JOIN
(SELECT water_meter_no, project_sn, water_tonnage (SELECT water_meter_no, project_sn, water_tonnage
from water_meter_record_detail from water_meter_record_detail
WHERE water_meter_no = #{waterMeterNo} WHERE water_meter_no = #{waterMeterNo}
AND DATE_FORMAT(add_time, "%Y-%m") = DATE_FORMAT(NOW(), "%Y-%m") AND DATE_FORMAT(add_time, "%Y-%m") = DATE_FORMAT(NOW(), "%Y-%m")
ORDER BY add_time LIMIT 1) b ON a.water_meter_no = b.water_meter_no ORDER BY add_time desc LIMIT 1) b ON a.water_meter_no = b.water_meter_no
LEFT JOIN (SELECT end_water_volume, water_meter_no LEFT JOIN (SELECT end_water_volume, water_meter_no
FROM water_meter_month_record FROM water_meter_month_record
where month_time = DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -2 MONTH), "%Y-%m") where month_time = DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 MONTH), "%Y-%m")
and water_meter_no = #{waterMeterNo}) c ON a.water_meter_no = c.water_meter_no and water_meter_no = #{waterMeterNo}) c ON a.water_meter_no = c.water_meter_no
WHERE a.water_meter_no = #{waterMeterNo} WHERE a.water_meter_no = #{waterMeterNo}
</select> </select>