修改数据源字段

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

@@ -9,6 +9,7 @@ import com.huimv.cattle.pojo.Stock;
 import com.huimv.cattle.service.OverviewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.cattle.token.TokenSign;
+import com.huimv.cattle.utils.FarmCodeUtils;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +35,8 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
     private OverviewMapper overviewMapper;
     @Override
     public Result overList(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
-        List<Overview> overviews = overviewMapper.selectList(null);
+        String farmCode = FarmCodeUtils.getFarmCode(paramsMap.get("farmCode"), httpServletRequest);
+        List<Overview> overviews = overviewMapper.selectList(new QueryWrapper<Overview>().eq("farm_code",farmCode));
         int stockCount=0;
         int outCount=0;
         int breedCount=0;

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

@@ -38,8 +38,11 @@ public class SalesCattleServiceImpl extends ServiceImpl<SalesCattleMapper, Sales
 
     @Override
     public Result getAllSaleCattle(String farmCode) {
-        QueryWrapper<SalesCattle> wrapper = new QueryWrapper<SalesCattle>().orderByDesc("year").orderByDesc("quarter").groupBy("year ").groupBy("quarter");
-        List<SalesCattle> list = salesCattleMapper.geaAllSaleCattle(wrapper);
+//        QueryWrapper<SalesCattle> wrapper = new QueryWrapper<SalesCattle>().orderByDesc("year").orderByDesc("quarter").groupBy("year ").groupBy("quarter");
+//        List<SalesCattle> list = salesCattleMapper.geaAllSaleCattle(wrapper);
+        QueryWrapper<SalesCattle> wrapper = new QueryWrapper<SalesCattle>();
+        wrapper.eq("farm_code",farmCode).orderByDesc("year").orderByDesc("quarter");
+        List<SalesCattle> list = salesCattleMapper.selectList(wrapper);
         if (ObjectUtil.isEmpty(list)){
             return new Result(ResultCode.SUCCESS,new ArrayList<>());
         }