智慧农业后台管理
tangzy
2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
@@ -145,13 +145,11 @@
      LandVO landInfo = (LandVO)landService.getLandInfo(land);
      //4. 查询农事记录信息(种植开始起)
      List<FarmingRecordVO> farmingRecordVOList = farmingRecordService.getFarmingRecordByFarmPlantId(recoveryVO);
      //5. 查询企业信息
      Farm farm = new Farm();
      farm.setDeptId(traceability1.getDeptId());
      Farm farmVO = farmService.getOne(new QueryWrapper<>(farm));
      //5. 查询农场信息
      Farm farm = farmService.getById(recoveryVO.getFarmId());
      //6. 数据封装
      dto.setRecoveryVO(recoveryVO);
      dto.setFarm(farmVO);
      dto.setFarm(farm);
      dto.setRecordVOList(farmingRecordVOList);
      dto.setPaperVOList(farmPaperList);
      dto.setLandVO(landInfo);
@@ -159,7 +157,7 @@
      if (null!=recoveryVO){
         count = count + 20;
      }
      if (null!=farmVO){
      if (null!=farm){
         count = count + 20;
      }
      if (null==landInfo){