农事操作，种植记录查询新增，地块，溯源码查询修改

Administrator

2022-07-13 3df8757ade3bdef3b5a142c846680102589260bc

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

@@ -66,6 +66,17 @@
   }

   /**
    * 自定义分页
    */
   @GetMapping("/pages")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入farmProductStock")
   public R<List<FarmProductStockVO>> pages(FarmProductStockVO farmProductStock) {
      List<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPages(farmProductStock);
      return R.data(pages);
   }

   /**
    * 统计产量
    *
    * @param farmProductStock
@@ -173,16 +184,41 @@
      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");
      System.out.println("cscsc"+ncpNcl);
      System.out.println(map.get("sum"));
//      List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
//      double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");

      map.put("ncpNcl",ncpNcl + Double.parseDouble(map.get("sum").toString()));
      map.put("ncpNcl", sum.get("cssum"));

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


   /**
    * 按月份统计产量
    */
   @GetMapping("/statisticsStockMonth")
   public R statisticsStockMonth(String year,String deptId) {

      //采收数量统计
      Map map = new HashMap();
      List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
      //加工产品数量统计
      Map<String, String> jgsum = null;

      return R.data(cssum);
   }

   /**
    * 农产品监管
    */
   @GetMapping("/productsSupervise")
   public R productsSupervise(String year,String deptId) {

      Map<String, String> cssum = farmProductStockService.productsSupervise(year, deptId);

      return R.data(cssum);
   }

}