boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
顾君禹
2025-08-23 22:22:28 +08:00
parent 3b354155a3 af7c5ba690
commit 19cd1a93d5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNameRespVO.java
View File

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
@@ -29,11 +30,14 @@ public class BaseNameRespVO {
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public static class PlotInfoVO { public static class PlotInfoVO {
@Schema(description = "地块ID", example = "4027") @Schema(description = "地块ID")
private String plotId; private String plotId;
@Schema(description = "地块名称", example = "王五") @Schema(description = "地块名称")
private String plotName; private String plotName;
@Schema(description = "地块总面积")
private BigDecimal plotArea;
} }
public BaseNameRespVO(String id, String name) { public BaseNameRespVO(String id, String name) {

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java
View File

@@ -113,7 +113,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
List<BaseNameRespVO.PlotInfoVO> childList = new ArrayList<>(); List<BaseNameRespVO.PlotInfoVO> childList = new ArrayList<>();
for (PlotInfoDO aDo : plotInfoDOS) { for (PlotInfoDO aDo : plotInfoDOS) {
if (aDo.getBaseId().equals(key)) { if (aDo.getBaseId().equals(key)) {
childList.add(new BaseNameRespVO.PlotInfoVO(aDo.getPlotId(), aDo.getPlotName())); childList.add(new BaseNameRespVO.PlotInfoVO(aDo.getPlotId(), aDo.getPlotName(), aDo.getPlotArea()));
} }
} }
obj.setChildren(childList); obj.setChildren(childList);