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

Administrator

2022-07-13 3df8757ade3bdef3b5a142c846680102589260bc

 src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java

@@ -36,8 +36,12 @@
import org.springblade.modules.stockfactory.service.IStockfactoryService;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
 * 农事记录控制器
@@ -89,6 +93,16 @@
   }

   /**
    * 查询农事操作记录（不分页）
    * @param farm
    * @return
    */
   @GetMapping("/getFarmingRecordList")
   public R getFarmingRecordList(FarmingRecordVO farm) {
      return R.data(farmService.getFarmingRecordListfarm(farm));
   }

   /**
    * 新增
    */
   @PostMapping("/save")
@@ -98,7 +112,7 @@
      //通过已出资农资id查询已出农资详情
      Soldr soldr = new Soldr();
      farm.setCreateTime(new Date());
      if(farm.getStockId()!=""){
      if (farm.getStockId() != "") {
         Long id = Long.valueOf(farm.getStockId());
         soldr.setId(id);
         //返回已出农资详情
@@ -137,7 +151,7 @@
         if (specsValue1 == 5) {
            v = farm.getSnum() * spe;
         }
          Long ids = Long.valueOf(detail.getStockId1());
         Long ids = Long.valueOf(detail.getStockId1());
         farm.setStockId(detail.getStockId1());
         farm.setCensus(v);
         farm.setCreateTime(new Date());
@@ -145,7 +159,7 @@
         stockfactory.setId(ids);
         Stockfactory detailstock = stockfactoryService.getOne(Condition.getQueryWrapper(stockfactory));
         String agriculturalName = detailstock.getAgriculturalName();
         String content=agriculturalName+"   "+v+"公斤";
         String content = agriculturalName + "   " + v + "公斤";
         farm.setContent(content);
         //使用农资数量等于已出农资数量
         if (farm.getSnum() == detail.getAmount1()) {
@@ -195,9 +209,10 @@
    * @return
    */
   @GetMapping("/getFarmingCount")
   public R getFarmingCount() {
      return R.data(farmService.getFarmingCount());
   public R getFarmingCount(String deptId) {
      return R.data(farmService.getFarmingCount(deptId));
   }


   /**
    * 查询统计本年农事记录操作,按分类统计
@@ -205,8 +220,29 @@
    * @return
    */
   @GetMapping("/getFarmingStatis")
   public R getFarmingStatis() {
      return R.data(farmService.getFarmingStatis());
   public R getFarmingStatis(String deptId) {
      return R.data(farmService.getFarmingStatis(deptId));
   }


   /**
    * 大屏农资使用概况统计
    *
    * @return
    */
   @GetMapping("/getStockCount")
   public R getStockCount(String deptId) {
      //今年
      Double aDouble = farmService.selectJyCount(deptId);
      //去年
      Double aDouble1 = farmService.selectQyCount(deptId);
      //本月
      Double aDouble2 = farmService.selectByCount(deptId);
      Map map = new HashMap();
      map.put("jn", aDouble);
      map.put("qn", aDouble1);
      map.put("by", aDouble2);
      return R.data(map);
   }

}