Merge remote-tracking branch 'origin/master'

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

@@ -116,8 +116,16 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
 
         QueryWrapper<DailyTabulateDataEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_code",farmCode);
+        if (startDate.length()<10 && startDate.length()>5){
+            startDate = startDate +"-01";
+            endDate = endDate +"-30";
+        }
+        if (startDate.length()<5){
+            startDate = startDate +"-01-01";
+            endDate = endDate +"-12-31";
+        }
         wrapper.ge(StringUtils.isNotBlank(startDate),"statistic_date",startDate);
-        wrapper.ge(StringUtils.isNotBlank(startDate),"statistic_date",endDate);
+        wrapper.le(StringUtils.isNotBlank(endDate),"statistic_date",endDate);
         wrapper.groupBy("ydate");
         wrapper.orderByDesc("statistic_date");
 
@@ -129,7 +137,7 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
         }
         if ("2".equals(type)){
             if (StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
-                wrapper.last("limit 6");
+                wrapper.last("lim it 6");
             }
             list = baseMapper.selectMonth(wrapper);
         }

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

@@ -233,7 +233,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             //牧场存栏统计
             QueryWrapper<FarmStockEntity> farmStockEQueryWrapper = new QueryWrapper<>();
             farmStockEQueryWrapper.eq("year", DateUtil.year(now));
-            farmStockEQueryWrapper.eq("month", DateUtil.month(now));
+            farmStockEQueryWrapper.eq("month", DateUtil.month(now)+1);
             farmStockEQueryWrapper.eq("farm_code", farmCode);
             FarmStockEntity farmStockEntity = farmStockDao.selectOne(farmStockEQueryWrapper);
             if (farmStockEntity == null) {