翅号

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/BaseBuildingVo.java

@@ -7,5 +7,7 @@ import lombok.Data;
 public class BaseBuildingVo extends BaseBuilding {
     private String chiNum;
 
+    private Integer dayAge;
+
     private Integer duckSex;
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/TreeBaseBuildingVo.java

@@ -24,6 +24,8 @@ public class TreeBaseBuildingVo implements Comparable<TreeBaseBuildingVo> {
 
     private Integer duckSex;
 
+    private Integer dayAge;
+
     private Integer farmCode;
 
     private Integer stageCode;

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

@@ -359,6 +359,7 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
             baseVo.setParentId(baseBuilding.getParentId());
             baseVo.setSort(baseBuilding.getSort());
             baseVo.setDuckSex(baseBuilding.getDuckSex());
+            baseVo.setDayAge(baseBuilding.getDayAge());
             baseVo.setChiNum(baseBuilding.getChiNum());
             baseVo.setStageCode(baseBuilding.getStageCode());
             baseVo.setBuildName(baseBuilding.getBuildName());

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

@@ -540,7 +540,10 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         List<EnvRegularCallFeeding> feedings = feedingMapper.listDayDesc(queryWrapper1);
         JSONArray jsonArray = new JSONArray();
         for (EnvRegularCallFeeding feeding : feedings) {
-            String s = feeding.getChiNum() + "翅号鸭进食" + feeding.getDuckWeight() + "g,";
+            String s ="";
+            if (feeding.getDuckWeight() > 0){
+                s = feeding.getChiNum() + "翅号鸭进食" + feeding.getDuckWeight() + "g,";
+            }
             Date callDate = feeding.getCallDate();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String s1 = sdf.format(callDate);

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

@@ -182,7 +182,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
                 .or()
                 .like(StringUtils.isNotBlank(unitName), "chi_num", unitName).or()
                 .like(StringUtils.isNotBlank(unitName), "jiao_num", unitName)
-                .select("IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum,duck_num duckNum,unit_name unitName,duck_id duckId")
+                .select("IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum,duck_num duckNum,chi_num chiNum,unit_name unitName,duck_id duckId")
                 .groupBy("duck_num")
                 .orderByDesc("call_date");
         Page<EnvRegularCallEgg> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));

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

@@ -100,7 +100,7 @@ ORDER BY duck_num
     </select>
 
     <select id="listTreeDuckBuilding" resultType="com.huimv.guowei.admin.entity.vo.BaseBuildingVo">
-        SELECT b.*, d.chi_num,d.duck_sex
+        SELECT b.*, d.chi_num,d.duck_sex,d.day_age
         FROM `base_building` b
         LEFT JOIN `base_duck_info` d ON b.id = d.unit_id AND d.is_cage = 0 AND b.farm_id = #{farmId}
         ORDER BY b.id ASC

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.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.chi_num chiNum,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.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.chi_num chiNum,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,