牧场栋舍

src/main/java/com/huimv/admin/entity/vo/BasePigpenCountVo.java

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 @Data
 public class BasePigpenCountVo {
     private Integer buildingNum;
+    private Integer storeyNum;
     private Integer unitNum;
     private Integer monthWarning;
     private Integer dayWarning;

src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -127,10 +127,13 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         BasePigpenCountVo basePigpenCountVo = new BasePigpenCountVo();
         //牧场栋舍
         basePigpenCountVo.setBuildingNum(basePigpenService.count(new QueryWrapper<BasePigpen>()
-                .eq("parent_id", 0)
+                .eq("f_type", 1)
+                .eq("farm_id",farmId)));
+        basePigpenCountVo.setStoreyNum(basePigpenService.count(new QueryWrapper<BasePigpen>()
+                .eq("f_type",2)
                 .eq("farm_id",farmId)));
         basePigpenCountVo.setUnitNum(basePigpenService.count(new QueryWrapper<BasePigpen>()
-                .ne("parent_id",0)
+                .eq("f_type",3)
                 .eq("farm_id",farmId)));
         //牧场预警
         basePigpenCountVo.setMonthWarning(envWarningService.count(new QueryWrapper<EnvWarning>()