|
|
@@ -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){
|