|
@@ -108,7 +108,7 @@
|
|
|
ORDER BY create_date ASC
|
|
ORDER BY create_date ASC
|
|
|
</select>
|
|
</select>
|
|
|
<select id="listDayGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
<select id="listDayGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
|
- SELECT Convert((IFNUll(sum(gas_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
|
|
|
|
|
|
|
+ SELECT ROUND(COALESCE(SUM(gas_value), 0),2) 'value',create_date 'createDate' FROM `energy_data`
|
|
|
${ew.customSqlSegment}
|
|
${ew.customSqlSegment}
|
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
|
|
|
ORDER BY create_date DESC
|
|
ORDER BY create_date DESC
|
|
@@ -122,14 +122,14 @@
|
|
|
ORDER BY create_date ASC
|
|
ORDER BY create_date ASC
|
|
|
</select>
|
|
</select>
|
|
|
<select id="listDayFeed" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
<select id="listDayFeed" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
|
- SELECT Convert((IFNUll(sum(feed_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
|
|
|
|
|
|
|
+ SELECT ROUND(COALESCE(SUM(feed_value), 0),2) 'value',create_date 'createDate' FROM `energy_data`
|
|
|
${ew.customSqlSegment}
|
|
${ew.customSqlSegment}
|
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
|
|
|
ORDER BY create_date DESC
|
|
ORDER BY create_date DESC
|
|
|
LIMIT 30
|
|
LIMIT 30
|
|
|
</select>
|
|
</select>
|
|
|
<select id="listYearWater" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
<select id="listYearWater" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
|
- SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
|
|
|
|
|
|
|
+ SELECT ROUND(COALESCE(SUM(water_value), 0),2) AS 'value',create_date 'createDate' FROM `energy_data`
|
|
|
${ew.customSqlSegment}
|
|
${ew.customSqlSegment}
|
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m')
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m')
|
|
|
ORDER BY create_date ASC
|
|
ORDER BY create_date ASC
|
|
@@ -148,7 +148,7 @@
|
|
|
ORDER BY create_date ASC
|
|
ORDER BY create_date ASC
|
|
|
</select>
|
|
</select>
|
|
|
<select id="listDayElectricity" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
<select id="listDayElectricity" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
|
|
|
- SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
|
|
|
|
|
|
|
+ SELECT ROUND(COALESCE(SUM(electricity_value), 0),2) 'value',create_date 'createDate' FROM `energy_data`
|
|
|
${ew.customSqlSegment}
|
|
${ew.customSqlSegment}
|
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
|
|
GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
|
|
|
ORDER BY create_date DESC
|
|
ORDER BY create_date DESC
|
