补贴等2个模块:修改查询问题

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/ProductionCapacityServiceImpl.java

@@ -48,7 +48,7 @@ public class ProductionCapacityServiceImpl extends ServiceImpl<ProductionCapacit
             yearNum = "0";
         }
         List<ProductionCapacity> productionCapacities = productionCapacityMapper.selectList(new QueryWrapper<ProductionCapacity>()
-                .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
+//                .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
                 .eq("farm_code",farmCode)
                 .orderByDesc("year"));
         if (ObjectUtil.isEmpty(productionCapacities)){

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SubsidyCountServiceImpl.java

@@ -48,7 +48,7 @@ public class SubsidyCountServiceImpl extends ServiceImpl<SubsidyCountMapper, Sub
             yearNum = "0";
         }
         List<SubsidyCount> subsidyCounts = subsidyCountMapper.selectList(new QueryWrapper<SubsidyCount>()
-                .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
+//                .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
                 .eq("farm_code",farmCode)
                 .orderByDesc("year"));
         if (ObjectUtil.isEmpty(subsidyCounts)){