溯源码详情查询修改

zhongrj

2022-07-29 4dff39db1e80e2c2dff1cf70f5ba9b199b5ebdc7

 src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java

@@ -29,6 +29,7 @@
import org.springblade.modules.traceability.vo.TraceabilityVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import sun.misc.BASE64Encoder;

import javax.sound.midi.Receiver;
@@ -138,7 +139,7 @@
      //1. 查询农产品采收记录信息
      RecoveryVO recoveryVO = recoveryService.getRecoveryDetail(traceability1.getRecoveryId());
      //2. 查询相关检测信息
      List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(traceability1.getDeptId());
      List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(recoveryVO.getFarmId(),recoveryVO.getFarmPlantId());
      //3. 查询产地（地块）信息
      LandVO land = new LandVO();
      land.setId(Long.parseLong(recoveryVO.getLandId()));
@@ -190,6 +191,7 @@
    * @return
    */
   @Override
   @Transactional
   public TraceabilityDetailDTO getTraceabilityDetailInfos(Traceability traceability) {
      TraceabilityDetailDTO dto = new TraceabilityDetailDTO();
      int count = 0;
@@ -205,7 +207,7 @@
      //1. 查询农产品采收记录信息
      RecoveryVO recoveryVO = recoveryService.getRecoveryDetail(traceability1.getRecoveryId());
      //2. 查询相关检测信息
      List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(traceability1.getDeptId());
      List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(recoveryVO.getFarmId(),recoveryVO.getFarmPlantId());
      //3. 查询产地（地块）信息
      LandVO land = new LandVO();
      land.setId(Long.parseLong(recoveryVO.getLandId()));
@@ -213,12 +215,10 @@
      //4. 查询农事记录信息(种植开始起)
      List<FarmingRecordVO> farmingRecordVOList = farmingRecordService.getFarmingRecordByFarmPlantId(recoveryVO);
      //5. 查询企业信息
      Farm farm = new Farm();
      farm.setDeptId(traceability1.getDeptId());
      Farm farmVO = farmService.getOne(new QueryWrapper<>(farm));
      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);