用水

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWaterMapper.xml

@@ -157,8 +157,8 @@
     </select>
 
     <select id="listUnitDayDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
-        SELECT COALESCE(ROUND(water_value,2),0) 'waterValue', create_date FROM `energy_water`
-        WHERE farm_id = #{farmId} and unit_id = #{unitId}
+        SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue', create_date FROM `energy_water`
+        WHERE farm_id = #{farmId} and unit_id = #{unitId} AND chip_code != 1005
         AND TO_DAYS(create_date) = TO_DAYS(NOW())
         group by create_date
     </select>

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -120,7 +120,7 @@ ON DATE_FORMAT(t1.call_date,"%Y-%m-%d") = DATE_FORMAT(t2.call_date,"%Y-%m-%d")
 ORDER BY t1.call_date Desc;
     </select>
     <select id="listSelect" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
-SELECT a.duck_num duckNum,a.chi_num chiNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate  ,b.callCode callCode,
+SELECT a.duck_num duckNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate  ,b.callCode callCode,
 a.chi_num chiNum,a.jiao_num jiaoNum,a.batch_num batchNum
 from base_duck_info a LEFT JOIN
 (select IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,duck_id duckId,call_date callDate ,call_code callCode from env_regular_call_feeding where call_date>#{date} and farm_id=#{farmId} GROUP BY call_code) b ON a.id=b.duckId
@@ -128,7 +128,7 @@ where farm_id=#{farmId} and a.is_cage='0'
 ORDER BY b.callDate DESC
     </select>
     <select id="listSelect1" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
-SELECT a.duck_num duckNum,a.chi_num chiNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate  ,b.callCode callCode,
+SELECT a.duck_num duckNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate  ,b.callCode callCode,
 a.chi_num chiNum,a.jiao_num jiaoNum,a.batch_num batchNum
 from base_duck_info a LEFT JOIN
 (select IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,duck_id duckId,call_date callDate ,call_code callCode,