fix (farm): 首页,基地/地块 (补充提交)
- 首页加载地块信息慢bug,使用redis缓存解决 - 地块户主信息,增加租赁费字段 ,包含导出/入
This commit is contained in:
@@ -78,9 +78,6 @@ public class BaseInfoRespVO {
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
public static class PlotInfo{
|
public static class PlotInfo{
|
||||||
// @Schema(description = "地块类型")
|
|
||||||
// private Integer type;
|
|
||||||
// private String typeName;
|
|
||||||
@Schema(description = "地块ID")
|
@Schema(description = "地块ID")
|
||||||
private String plotId;
|
private String plotId;
|
||||||
@Schema(description = "地块名称")
|
@Schema(description = "地块名称")
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description: TODO
|
* @description: TODO
|
||||||
* @author: binda
|
* @author: binda
|
||||||
@@ -45,4 +47,6 @@ public class PlotLesseeDetailsRespVO {
|
|||||||
private String leaseStatus;
|
private String leaseStatus;
|
||||||
@ExcelProperty("租赁状态")
|
@ExcelProperty("租赁状态")
|
||||||
private String leaseStatusName;
|
private String leaseStatusName;
|
||||||
|
|
||||||
|
private BigDecimal leaseRental;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -324,10 +324,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
|
|||||||
// 户主
|
// 户主
|
||||||
List<PlotLesseeDetailsRespVO> lesseeList = plotLesseeService.getPlotLesseeList(aDo.getId());
|
List<PlotLesseeDetailsRespVO> lesseeList = plotLesseeService.getPlotLesseeList(aDo.getId());
|
||||||
String plotManager = employeeMap.getOrDefault(aDo.getEmployeeId(), "系统");
|
String plotManager = employeeMap.getOrDefault(aDo.getEmployeeId(), "系统");
|
||||||
// String typeName = PLOT_TYPE_NAME_MAP.get(Integer.valueOf(aDo.getType()));
|
|
||||||
BaseInfoRespVO.PlotInfo target = new BaseInfoRespVO.PlotInfo(
|
BaseInfoRespVO.PlotInfo target = new BaseInfoRespVO.PlotInfo(
|
||||||
// Integer.valueOf(aDo.getType()),
|
|
||||||
// typeName,
|
|
||||||
aDo.getId(),
|
aDo.getId(),
|
||||||
aDo.getPlotName(),
|
aDo.getPlotName(),
|
||||||
aDo.getPlotColor(),
|
aDo.getPlotColor(),
|
||||||
|
|||||||
Reference in New Issue
Block a user