Merge remote-tracking branch 'origin/master'

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/DailyTabulateDataController.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import com.huimv.manager.entity.vo.DailySowVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -102,9 +103,9 @@ public class DailyTabulateDataController {
      */
     @RequestMapping("/countAllsow")
     public R countAllsow(@RequestParam Map<String, Object> params){
-        List list = dailyTabulateDataService.countAllsow(params);
+        Map list = dailyTabulateDataService.countAllsow(params);
 
-        return R.ok().put("page", list);
+        return R.ok().put("data", list);
     }
 
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/DailyTabulateDataDao.java

@@ -38,5 +38,5 @@ public interface DailyTabulateDataDao extends BaseMapper<DailyTabulateDataEntity
 
     List<DailyVo> selectYear(@Param(Constants.WRAPPER) QueryWrapper<DailyTabulateDataEntity> wrapper);
 
-    DailySowVo counSowAll(@Param(Constants.WRAPPER) QueryWrapper<BaseFarmInfoEntity> wrapper);
+    DailySowVo counSowAll(@Param(Constants.WRAPPER) QueryWrapper<DailyTabulateDataEntity> wrapper);
 }

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

@@ -1,6 +1,7 @@
 package com.huimv.manager.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.manager.entity.vo.DailySowVo;
 import com.huimv.manager.utils.PageUtils;
 import com.huimv.manager.entity.DailyTabulateDataEntity;
 
@@ -22,6 +23,6 @@ public interface DailyTabulateDataService extends IService<DailyTabulateDataEnti
 
     List countAllChange(Map<String, Object> params);
 
-    List countAllsow(Map<String, Object> params);
+    Map countAllsow(Map<String, Object> params);
 }
 

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

@@ -15,10 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -146,7 +144,7 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
     }
 
     @Override
-    public List countAllsow(Map<String, Object> params) {
+    public Map countAllsow(Map<String, Object> params) {
 //        String type =(String)params.get("type");
         String countyCode = (String)params.get("countyCode");
 
@@ -157,13 +155,47 @@ 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());
         }
-        wrapper.in("farm_code",farmCodeList);
-        wrapper.eq("statistic_date", DateUtil.beginOfDay(new Date()));
-        DailySowVo dailySowVo = baseMapper.counSowAll(wrapper);
 
-        return null;
+
+        QueryWrapper<DailyTabulateDataEntity> wrapper1 = new QueryWrapper<>();
+
+        wrapper1.in("farm_code",farmCodeList);
+        wrapper1.eq("statistic_date", DateUtil.beginOfDay(new Date()));
+        DailySowVo dailySowVo = baseMapper.counSowAll(wrapper1);
+
+
+        wrapper1.clear();
+        wrapper1.in("farm_code",farmCodeList);
+        wrapper1.eq("statistic_date", DateUtil.offsetDay(DateUtil.beginOfDay(new Date()),-1));
+        DailySowVo yestDayDailySowVo = baseMapper.counSowAll(wrapper1);
+        Integer sowStock = dailySowVo.getSowStock();
+        Integer yestdaySowStock = yestDayDailySowVo.getSowStock();
+
+        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);
+        }else {
+            map.put("sowStockValue",yestdaySowStock - sowStock);
+            map.put("sowStockType",false);
+        }
+
+        map.put("stockToal",dailySowVo.getStockTotal());
+        map.put("stock1",dailySowVo.getStock1());
+        map.put("stock2",dailySowVo.getStock2());
+        map.put("stock3",dailySowVo.getStock4());
+
+
+        return map;
     }
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/DailyTabulateDataDao.xml

@@ -24,7 +24,7 @@
              DATE_FORMAT( statistic_date,"%m-%d") ydate,
              SUM(stock1) stock1,
              SUM(stock2) stock2,
-             SUM(stock3) stock3 ,
+             SUM(stock4) stock3 ,
              SUM(stock_new) stockNew,
              SUM(offline_no) offlineNo
              FROM `daily_tabulate_data`
@@ -36,7 +36,7 @@
          DATE_FORMAT(statistic_date,"%Y-%m") ydate,
          SUM(stock1) stock1,
          SUM(stock2) stock2,
-         SUM(stock3) stock3 ,
+         SUM(stock4) stock3 ,
          SUM(stock_new) stockNew,
          SUM(offline_no) offlineNo
 
@@ -49,7 +49,7 @@
          DATE_FORMAT(statistic_date,"%Y")  ydate,
          SUM(stock1) stock1,
          SUM(stock2) stock2,
-         SUM(stock3) stock3 ,
+         SUM(stock4) stock3 ,
          SUM(stock_new) stockNew,
          SUM(offline_no) offlineNo
 
@@ -119,6 +119,7 @@
             SUM(stock1) stock1,
             SUM(stock2) stock2,
             SUM(stock4) stock4
+        from daily_tabulate_data
         ${ew.customSqlSegment}
 
     </select>