소스 검색

修复首页地块列表查询未返回所属基地的bug

liuyaowen 10 달 전
부모
커밋
20254e1e99

+ 8 - 0
src/main/java/com/yunfeiyun/agmp/fms/controller/FmsBlockController.java

@@ -265,10 +265,18 @@ public class FmsBlockController extends BaseController {
                 fmsPlanCropResVo.setCropPreview(sysRes.getResOssUrl());
             }
         }
+        FmsLand fmsLandQuery = new FmsLand();
+        fmsLandQuery.setBlockIds(blockIds);
+        List<FmsLand> fmsLands = fmsLandService.selectFmsLandList(fmsLandQuery);
+        Map<String,FmsLand> fmsLandMap = fmsLands.stream().collect(Collectors.toMap(FmsLand::getLandId,item->item));
         List<FmsBlockPlanResVo> list = new ArrayList<>();
         for(FmsBlock fmsBlock : fmsBlocks){
             FmsBlockPlanResVo fmsBlockPlanResVo = new FmsBlockPlanResVo();
             BeanUtils.copyProperties(fmsBlock,fmsBlockPlanResVo);
+            FmsLand fmsLand = fmsLandMap.get(fmsBlock.getLandId());
+            if(null != fmsLand){
+                fmsBlockPlanResVo.setLandName(fmsLand.getLandName());
+            }
             fmsBlockPlanResVo.setFmsPlanCropResVoList(new ArrayList<>());
             SysUser sysUser = userMap.get(fmsBlock.getBlockManager());
             if(null != sysUser){

+ 1 - 0
src/main/java/com/yunfeiyun/agmp/fms/domain/resvo/FmsBlockPlanResVo.java

@@ -7,5 +7,6 @@ import java.util.List;
 
 @Data
 public class FmsBlockPlanResVo extends FmsBlock {
+    private String landName;
     private List<FmsPlanCropResVo> fmsPlanCropResVoList;
 }