diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java index 242b4c07..3ea386bf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java @@ -78,9 +78,6 @@ public class BaseInfoRespVO { @AllArgsConstructor @NoArgsConstructor public static class PlotInfo{ -// @Schema(description = "地块类型") -// private Integer type; -// private String typeName; @Schema(description = "地块ID") private String plotId; @Schema(description = "地块名称") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotLesseeDetailsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotLesseeDetailsRespVO.java index 4b2f79f4..b7203dee 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotLesseeDetailsRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotLesseeDetailsRespVO.java @@ -7,6 +7,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; + /** * @description: TODO * @author: binda @@ -45,4 +47,6 @@ public class PlotLesseeDetailsRespVO { private String leaseStatus; @ExcelProperty("租赁状态") private String leaseStatusName; + + private BigDecimal leaseRental; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java index 4fe7af53..dc386ba0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java @@ -324,10 +324,7 @@ public class BaseInfoServiceImpl implements BaseInfoService { // 户主 List lesseeList = plotLesseeService.getPlotLesseeList(aDo.getId()); String plotManager = employeeMap.getOrDefault(aDo.getEmployeeId(), "系统"); -// String typeName = PLOT_TYPE_NAME_MAP.get(Integer.valueOf(aDo.getType())); BaseInfoRespVO.PlotInfo target = new BaseInfoRespVO.PlotInfo( -// Integer.valueOf(aDo.getType()), -// typeName, aDo.getId(), aDo.getPlotName(), aDo.getPlotColor(),