|
@@ -152,7 +152,7 @@
|
|
|
|
|
|
<select id="getUnitDayWater" resultType="java.math.BigDecimal">
|
|
|
SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue' FROM `energy_water`
|
|
|
- WHERE farm_id = #{farmId} and unit_id = #{unitId}
|
|
|
+ WHERE farm_id = #{farmId} and unit_id = #{unitId} AND chip_code != 1005
|
|
|
AND TO_DAYS(create_date) = TO_DAYS(NOW())
|
|
|
</select>
|
|
|
|
|
@@ -166,7 +166,7 @@
|
|
|
|
|
|
<select id="listUnitMonthDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
|
|
|
SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue', create_date FROM `energy_water`
|
|
|
- WHERE farm_id = #{farmId} and unit_id = #{unitId}
|
|
|
+ WHERE farm_id = #{farmId} and unit_id = #{unitId} AND chip_code != 1005
|
|
|
AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
|
|
|
GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
|
|
|
</select>
|