母猪总存栏等

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

@@ -116,14 +116,25 @@ 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";
+        if (startDate != null && startDate.length() > 0){
+            if (startDate.length()==7){
+                startDate = startDate+"-01";
+            }
+            if ( startDate.length()==4){
+                startDate = startDate+"-01-01";
+            }
         }
+
+       if (endDate != null && endDate.length() > 0){
+           if ( endDate.length()==4){
+               endDate = endDate+"-12-30";
+           }
+           if ( endDate.length()==7){
+               endDate = endDate+"-30";
+           }
+       }
+
+
         wrapper.ge(StringUtils.isNotBlank(startDate),"statistic_date",startDate);
         wrapper.le(StringUtils.isNotBlank(endDate),"statistic_date",endDate);
         wrapper.groupBy("ydate");
@@ -137,7 +148,7 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
         }
         if ("2".equals(type)){
             if (StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
-                wrapper.last("lim it 6");
+                wrapper.last("limit 6");
             }
             list = baseMapper.selectMonth(wrapper);
         }