From 3692ceee4c14cf6ab30acb9264bb9d4781a3175a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Wed, 12 Nov 2025 22:02:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E9=A6=96=E9=A1=B5,=E5=9F=BA?= =?UTF-8?q?=E5=9C=B0/=E5=9C=B0=E5=9D=97=20(=E8=A1=A5=E5=85=85=E6=8F=90?= =?UTF-8?q?=E4=BA=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 首页加载地块信息慢bug,使用redis缓存解决 - 地块户主信息,增加租赁费字段 ,包含导出/入 --- .../admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java | 3 --- .../managementcenter/baseinfo/vo/PlotLesseeDetailsRespVO.java | 4 ++++ .../module/farm/service/baseinfo/BaseInfoServiceImpl.java | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) 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(),