app查询栋舍列表

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/vo/PigpenVo.java

@@ -22,5 +22,7 @@ public class PigpenVo {
 
     private Integer countPig;
 
+    private Integer unitId;
+
 
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/BasePigpenServiceImpl.java

@@ -117,7 +117,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
                 pigpenVo.setPigpenTemp(record.getPigpenTemp());
                 pigpenVo.setStage(record.getStage());
                 pigpenVo.setTempAnomaly(record.getTempAnomaly());
-
+                pigpenVo.setUnitId(record.getId());
 
                 pigpenVo.setCountPig(countPig);
                 pigpenVos.add(pigpenVo);
@@ -153,7 +153,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
                 pigpenVo.setPigpenTemp(record.getPigpenTemp());
                 pigpenVo.setStage(record.getStage());
                 pigpenVo.setTempAnomaly(record.getTempAnomaly());
-
+                pigpenVo.setUnitId(record.getId());
 
                 pigpenVo.setCountPig(countPig);
                 pigpenVos.add(pigpenVo);
@@ -190,6 +190,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
                 pigpenVo.setStage(record.getStage());
                 pigpenVo.setTempAnomaly(record.getTempAnomaly());
                 pigpenVo.setCountPig(countPig);
+                pigpenVo.setUnitId(record.getId());
                 pigpenVos.add(pigpenVo);
             }
             page1 = page;
@@ -250,8 +251,8 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
         String deviceCode = collectorRegisterEntities.get(0).getDeviceCode();
         QueryWrapper<DeviceTempEntity> deviceTempEntityQueryWrapper = new QueryWrapper<>();
         deviceTempEntityQueryWrapper.eq("device_code",deviceCode);
-        deviceTempEntityQueryWrapper.le("device_code",createEndDate);
-        deviceTempEntityQueryWrapper.ge("device_code",createStartDate);
+        deviceTempEntityQueryWrapper.le(StringUtils.isNotBlank(createEndDate),"create_date",createEndDate);
+        deviceTempEntityQueryWrapper.ge(StringUtils.isNotBlank(createStartDate),"create_date",createStartDate);
 
 
         return  deviceTempDao.selectList(deviceTempEntityQueryWrapper);