溯源码详情查询修改

zhongrj

2022-07-29 4dff39db1e80e2c2dff1cf70f5ba9b199b5ebdc7

 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java

@@ -76,6 +76,15 @@
      return R.data(pages);
   }

   @GetMapping("/getFarmProductStockByFarmIdAndStrainId")
   public R<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId,Integer strainId) {
      List<FarmProductStock> farmProductStockList = farmProductStockService.findFarmProductStockByFarmIdAndStrainId(farmId,strainId);
      if (farmProductStockList.size() == 0) {
         return R.data(null);
      }
      return R.data(farmProductStockList.get(0));
   }

   /**
    * 统计产量
    *
@@ -180,14 +189,20 @@
      Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
      //统计当前库存加工产品
      Map<String, String> jgsum = null;
      map.put("sum",sum.get("sum"));
      if (sum != null){
         map.put("sum",sum.get("sum"));
         map.put("ncpNcl", sum.get("cssum"));
      }else{
         map.put("sum",0);
         map.put("ncpNcl",0);
      }
      map.put("jgsum",0);

      //农产品年产量统计
//      List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
//      double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");

      map.put("ncpNcl", sum.get("cssum"));


      //加工产品年产量统计
      map.put("jgNcl",0);