bug修改

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -122,7 +122,7 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
 
             QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
-                    .select("IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,call_date callDate,unit_name unitName,duck_id duckId")
+                    .select("IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,call_date callDate,unit_name unitName,duck_id duckId,call_code callCode")
                     .ge("call_date", timesMonthmorning)
                     .orderByDesc("call_date");
 

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

@@ -94,9 +94,9 @@ 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.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate
+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
 from base_duck_info a LEFT JOIN
-(select IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,duck_id duckId,call_date callDate from env_regular_call_feeding where call_date>#{date} and farm_id=#{farmId}) b ON a.id=b.duckId
+(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}) b ON a.id=b.duckId
 where farm_id=#{farmId} and a.is_cage='0'
 ORDER BY b.callDate DESC
     </select>