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

@@ -145,8 +145,8 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
 
     @Override
     public Map countAllsow(Map<String, Object> params) {
-//        String type =(String)params.get("type");
         String countyCode = (String)params.get("countyCode");
+        String farmCode = (String)params.get("farmCode");
 
         QueryWrapper<BaseFarmInfoEntity> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(countyCode)){
@@ -155,9 +155,7 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
 
         List<String>  farmCodeList = new ArrayList();
         List<BaseFarmInfoEntity> baseFarmInfoEntities = baseFarmInfoDao.selectList(wrapper);
-        if (baseFarmInfoEntities == null ||baseFarmInfoEntities.size() == 0){
-            throw new RRException("该区域没有牧场");
-        }
+
         for (BaseFarmInfoEntity baseFarmInfoEntity : baseFarmInfoEntities) {
             farmCodeList.add( baseFarmInfoEntity.getFarmCode());
         }
@@ -165,29 +163,29 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
 
         QueryWrapper<DailyTabulateDataEntity> wrapper1 = new QueryWrapper<>();
 
-        wrapper1.in("farm_code",farmCodeList);
+        wrapper1.in(farmCodeList != null && farmCodeList.size() >0,"farm_code",farmCodeList).or().eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
         wrapper1.eq("statistic_date", DateUtil.beginOfDay(new Date()));
         DailySowVo dailySowVo = baseMapper.counSowAll(wrapper1);
 
 
         wrapper1.clear();
-        wrapper1.in("farm_code",farmCodeList);
+        wrapper1.in(farmCodeList != null && farmCodeList.size() >0,"farm_code",farmCodeList).or().or().eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
         wrapper1.eq("statistic_date", DateUtil.offsetDay(DateUtil.beginOfDay(new Date()),-1));
         DailySowVo yestDayDailySowVo = baseMapper.counSowAll(wrapper1);
-        Integer sowStock = dailySowVo.getSowStock();
-        Integer yestdaySowStock = yestDayDailySowVo.getSowStock();
+        Integer sowTotalStock = dailySowVo.getStockTotal();
+        Integer yestdayTotalSowStock = yestDayDailySowVo.getStockTotal();
 
         Map map = new HashMap();
-        map.put("sowStock",sowStock);
-        if (yestdaySowStock.equals(sowStock)){
-            map.put("sowStockValue",0);
-            map.put("sowStockType",null);
-        }else if(sowStock > yestdaySowStock){
-            map.put("sowStockValue",sowStock - yestdaySowStock);
-            map.put("sowStockType",true);
+        map.put("sowStock",sowTotalStock);
+        if (yestdayTotalSowStock.equals(sowTotalStock)){
+            map.put("sowTotalStockValue",0);
+            map.put("sowTotalStockType",null);
+        }else if(sowTotalStock > yestdayTotalSowStock){
+            map.put("sowTotalStockValue",sowTotalStock - yestdayTotalSowStock);
+            map.put("sowTotalStockType",true);
         }else {
-            map.put("sowStockValue",yestdaySowStock - sowStock);
-            map.put("sowStockType",false);
+            map.put("sowTotalStockValue",yestdayTotalSowStock - sowTotalStock);
+            map.put("sowTotalStockType",false);
         }
 
         map.put("stockToal",dailySowVo.getStockTotal());

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

@@ -49,7 +49,8 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
         String maxSowStock =(String) params.get("maxSowStock");
 
         QueryWrapper<FarmStockEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(countyCode),"county_code",countyCode).or().eq(StringUtils.isNotBlank(countyCode),"city_code",countyCode);
+//        wrapper.eq(StringUtils.isNotBlank(countyCode),"county_code",countyCode).or().eq(StringUtils.isNotBlank(countyCode),"city_code",countyCode);
+
 
         wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName);
 
@@ -65,7 +66,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
         wrapper.ge(StringUtils.isNotBlank(minOfflineNo),"sow_stock",minSowStock);
         wrapper.le(StringUtils.isNotBlank(maxOfflineNo),"sow_stock",maxSowStock);
         wrapper.apply("id IN( SELECT MAX(id) FROM `farm_stock` GROUP BY farm_code)");
-
+        wrapper.apply("county_code = "+countyCode+" OR city_code = "+countyCode);
 
         IPage<FarmStockEntity> page = this.page(
                 new Query<FarmStockEntity>().getPage(params),
@@ -313,7 +314,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
                 map.put("name", farmStockEntity.getFarmName());
                 map.put("code", regionCode.getRegionCode());
                 map.put("children",null);
-                map.put("tpye",4);
+                map.put("type",4);
                 endList.add(map);
             }
         }