修改12

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyDataServiceImpl.java

@@ -380,23 +380,25 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         String electricityDisplayType = paramsMap.get("electricityDisplayType");
         String feedDisplayType = paramsMap.get("feedDisplayType");
         String gasDisplayType = paramsMap.get("gasDisplayType");
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
         QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId);
+        queryWrapper1.eq("farm_id", farmId).ge("create_date", calendar.getTime());
         if (ObjectUtil.isNotEmpty(gasDisplayType)) {
             queryWrapper1.eq("display_type", gasDisplayType);
         }
         QueryWrapper<EnergyData> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("farm_id", farmId);
+        queryWrapper2.eq("farm_id", farmId).ge("create_date", calendar.getTime());
         if (ObjectUtil.isNotEmpty(feedDisplayType)) {
             queryWrapper2.eq("display_type", feedDisplayType);
         }
         QueryWrapper<EnergyData> queryWrapper3 = new QueryWrapper<>();
-        queryWrapper3.eq("farm_id", farmId);
+        queryWrapper3.eq("farm_id", farmId).ge("create_date", calendar.getTime());
         if (ObjectUtil.isNotEmpty(waterDisplayType)) {
             queryWrapper3.eq("display_type", waterDisplayType);
         }
         QueryWrapper<EnergyData> queryWrapper4 = new QueryWrapper<>();
-        queryWrapper4.eq("farm_id", farmId);
+        queryWrapper4.eq("farm_id", farmId).ge("create_date", calendar.getTime());
         if (ObjectUtil.isNotEmpty(electricityDisplayType)) {
             queryWrapper4.eq("display_type", electricityDisplayType);
         }